valgrind: Fix running webkit-tests.

tools/valgrind/valgrind_test.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
 
 import datetime
 import glob
@@ skipping 339 matching lines @@
 
   def ToolCommand(self):
     """Get the valgrind command to run."""
     # Note that self._args begins with the exe to be run.
     tool_name = self.ToolName()
 
     # Construct the valgrind command.
     if self.SelfContained():
       proc = ["valgrind-%s.sh" % tool_name]
     else:
-      proc = ["valgrind", "--tool=%s" % tool_name]
+      if 'CHROME_VALGRIND' in os.environ:
+        path = os.path.join(os.environ['CHROME_VALGRIND'], "bin", "valgrind")
+      else:
+        path = "valgrind"
+      proc = [path, "--tool=%s" % tool_name]
 
     proc += ["--num-callers=%i" % int(self._options.num_callers)]
 
     if self._options.trace_children:
       proc += ["--trace-children=yes"]
       proc += ["--trace-children-skip='*dbus-daemon*'"]
       proc += ["--trace-children-skip='*dbus-launch*'"]
       proc += ["--trace-children-skip='*perl*'"]
       proc += ["--trace-children-skip='*python*'"]
       # This is really Python, but for some reason Valgrind follows it.
@@ skipping 848 matching lines @@
       return Asan()
     try:
       platform_name = common.PlatformNames()[0]
     except common.NotImplementedError:
       platform_name = sys.platform + "(Unknown)"
     raise RuntimeError, "Unknown tool (tool=%s, platform=%s)" % (tool_name,
                                                                  platform_name)
 
 def CreateTool(tool):
   return ToolFactory().Create(tool)