From 8a8646c0b2dc52ce8fac56f3489e8d2dd9f0bce7 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Tue, 8 Nov 2016 22:07:17 +0100
Subject: [PATCH] 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>
---
 tools/run-valgrind.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tools/run-valgrind.py b/tools/run-valgrind.py
index e3f84f58fed3fc..9e26dbed8ed53a 100755
--- a/tools/run-valgrind.py
+++ b/tools/run-valgrind.py
@@ -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',
@@ -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();