1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools: fix run-valgrind.py script

Browse Source 
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>
This commit is contained in:
Ben Noordhuis 2016-11-08 22:07:17 +01:00
parent 043a98c494
commit e762ca0060
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/run-valgrind.py
View File

@ -40,13 +40,9 @@ import subprocess
import sys import sys
V8_ROOT = path.dirname(path.dirname(path.abspath(__file__))) 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_ARGUMENTS = [
VALGRIND_BIN, 'valgrind',
'--error-exitcode=1', '--error-exitcode=1',
'--leak-check=full', '--leak-check=full',
'--smc-check=all', '--smc-check=all',
@ -65,11 +61,7 @@ if not path.exists(executable):
command = VALGRIND_ARGUMENTS + [executable] + sys.argv[2:] command = VALGRIND_ARGUMENTS + [executable] + sys.argv[2:]
# Run valgrind. # Run valgrind.
process = subprocess.Popen( process = subprocess.Popen(command, stderr=subprocess.PIPE)
command,
stderr=subprocess.PIPE,
env={'VALGRIND_LIB': VALGRIND_LIB}
)
code = process.wait(); code = process.wait();
errors = process.stderr.readlines(); errors = process.stderr.readlines();