Skip to content

Commit 8a8646c

Browse files
bnoordhuisMylesBorins
authored andcommitted
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: #9520 Reviewed By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 5401b04 commit 8a8646c

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

‎tools/run-valgrind.py‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,9 @@
4040
importsys
4141

4242
V8_ROOT=path.dirname(path.dirname(path.abspath(__file__)))
43-
MACHINE='linux_x64'ifplatform.machine() =='x86_64'else'linux_x86'
44-
VALGRIND_ROOT=path.join(V8_ROOT, 'third_party', 'valgrind', MACHINE)
45-
VALGRIND_BIN=path.join(VALGRIND_ROOT, 'bin', 'valgrind')
46-
VALGRIND_LIB=path.join(VALGRIND_ROOT, 'lib', 'valgrind')
4743

4844
VALGRIND_ARGUMENTS= [
49-
VALGRIND_BIN,
45+
'valgrind',
5046
'--error-exitcode=1',
5147
'--leak-check=full',
5248
'--smc-check=all',
@@ -65,11 +61,7 @@
6561
command=VALGRIND_ARGUMENTS+ [executable] +sys.argv[2:]
6662

6763
# Run valgrind.
68-
process=subprocess.Popen(
69-
command,
70-
stderr=subprocess.PIPE,
71-
env={'VALGRIND_LIB': VALGRIND_LIB}
72-
)
64+
process=subprocess.Popen(command, stderr=subprocess.PIPE)
7365
code=process.wait();
7466
errors=process.stderr.readlines();
7567

0 commit comments

Comments
(0)