Support valgrinding layout tests.

webkit/tools/layout_tests/layout_package/test_shell_thread.py

 # Copyright (c) 2006-2008 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.
 
 """A Thread object for running the test shell and processing URLs from a
 shared queue.
 
 Each thread runs a separate instance of the test_shell binary and validates
 the output.  When there are no more URLs to process in the shared queue, the
 thread exits.
@@ skipping 84 matching lines @@
     # Don't add any more failures if we already have a crash or timeout, so
     # we don't double-report those tests.
     if not crash_or_timeout:
       failures.extend(new_failures)
 
   return failures
 
 
 def StartTestShell(command, args):
   """Returns the process for a new test_shell started in layout-tests mode."""
-  cmd = command + ['--layout-tests'] + args
+  cmd = []
+  # Hook for injecting valgrind or other runtime instrumentation,
+  # used by e.g. tools/valgrind/valgrind_tests.py.
+  wrapper = os.environ["BROWSER_WRAPPER"]
+  if wrapper != None:
+    cmd += [wrapper]
+  cmd += command + ['--layout-tests'] + args
   return subprocess.Popen(cmd,
                           stdin=subprocess.PIPE,
                           stdout=subprocess.PIPE,
                           stderr=subprocess.STDOUT)
 
 
 class SingleTestThread(threading.Thread):
   """Thread wrapper for running a single test file."""
   def __init__(self, test_shell_command, shell_args, test_uri, filename,
                test_types, test_args, target):
@@ skipping 213 matching lines @@
                                              self._shell_args)
 
   def _KillTestShell(self):
     """Kill the test shell process if it's running."""
     if self._test_shell_proc:
       self._test_shell_proc.stdin.close()
       self._test_shell_proc.stdout.close()
       if self._test_shell_proc.stderr:
         self._test_shell_proc.stderr.close()
       self._test_shell_proc = None