diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2016-11-08 22:07:17 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2016-11-15 17:01:22 +0100 |
| commit | e762ca0060dcce3e047cacc7824ba07e0fb045f3 (patch) | |
| tree | 99d1906ac161988275f64cfbe09398c408aa442b | |
| parent | 043a98c4941cccafb5a2de0c653a798cc80f8121 (diff) | |
| download | android-node-v8-e762ca0060dcce3e047cacc7824ba07e0fb045f3.tar.gz android-node-v8-e762ca0060dcce3e047cacc7824ba07e0fb045f3.tar.bz2 android-node-v8-e762ca0060dcce3e047cacc7824ba07e0fb045f3.zip | |
tools: fix run-valgrind.py script
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: https://github.com/nodejs/node/pull/9520
Reviewed By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
| -rwxr-xr-x | tools/run-valgrind.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tools/run-valgrind.py b/tools/run-valgrind.py index e3f84f58fe..9e26dbed8e 100755 --- a/tools/run-valgrind.py +++ b/tools/run-valgrind.py @@ -40,13 +40,9 @@ import subprocess 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', @@ -65,11 +61,7 @@ if not path.exists(executable): 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(); |