Skip to content

Commit

Permalink
tools: fix run-valgrind.py script
Browse files Browse the repository at this point in the history
The script had a dependency on the copy of valgrind that is bundled
with V8 but that only gets checked out when doing a full depot_tools
checkout.  Use the system-provided valgrind.

PR-URL: #9520
Reviewed By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
bnoordhuis authored and addaleax committed Nov 22, 2016
1 parent 65b6080 commit 887c76a
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions tools/run-valgrind.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,9 @@
import sys

V8_ROOT = path.dirname(path.dirname(path.abspath(__file__)))
MACHINE = 'linux_x64' if platform.machine() == 'x86_64' else 'linux_x86'
VALGRIND_ROOT = path.join(V8_ROOT, 'third_party', 'valgrind', MACHINE)
VALGRIND_BIN = path.join(VALGRIND_ROOT, 'bin', 'valgrind')
VALGRIND_LIB = path.join(VALGRIND_ROOT, 'lib', 'valgrind')

VALGRIND_ARGUMENTS = [
VALGRIND_BIN,
'valgrind',
'--error-exitcode=1',
'--leak-check=full',
'--smc-check=all',
Expand All @@ -65,11 +61,7 @@
command = VALGRIND_ARGUMENTS + [executable] + sys.argv[2:]

# Run valgrind.
process = subprocess.Popen(
command,
stderr=subprocess.PIPE,
env={'VALGRIND_LIB': VALGRIND_LIB}
)
process = subprocess.Popen(command, stderr=subprocess.PIPE)
code = process.wait();
errors = process.stderr.readlines();

Expand Down

0 comments on commit 887c76a

Please sign in to comment.