When running ui_tests, need to tell valgrind to also trace child processes.

tools/valgrind/valgrind_test.py

 #!/usr/bin/python
 # 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.
 
 # purify_test.py
 
 '''Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 '''
 
 import datetime
 import glob
 import logging
 import optparse
 import os
 import shutil
+import stat
 import sys
+import tempfile
 
 import common
 
 import valgrind_analyze
 
 import google.logging_utils
 
 rmtree = shutil.rmtree
 
 class Valgrind(object):
@@ skipping 22 matching lines @@
                             help="path to top of source tree for this build"
                                  "(used to normalize source paths in baseline)")
     self._parser.add_option("", "--suppressions", default=["."],
                             action="append",
                             help="path to a valgrind suppression file")
     self._parser.add_option("", "--gtest_filter", default="",
                             help="which test case to run")
     self._parser.add_option("", "--gtest_print_time", action="store_true",
                             default=False,
                             help="show how long each test takes")
+    self._parser.add_option("", "--trace_children", action="store_true",
+                            default=False,
+                            help="also trace child processes")
+    self._parser.add_option("", "--indirect", action="store_true",
+                            default=False,
+                            help="set BROWSER_WRAPPER rather than running valgrind directly")

[Dean McNamee, 2009/03/27 11:34:55]

80 cols

     self._parser.add_option("", "--show_all_leaks", action="store_true",
                             default=False,
                             help="also show less blatant leaks")
     self._parser.add_option("", "--generate_suppressions", action="store_true",
                             default=False,
                             help="Skip analysis and generate suppressions")
     self._parser.add_option("-v", "--verbose", action="store_true", default=False,
                     help="verbose output - enable debug log messages")
     self._parser.description = __doc__
 
@@ skipping 99 matching lines @@
     """Get the valgrind command to run."""
     # note that self._args begins with the exe to be run
     # TODO(erg): We probably want to get a version of valgrind that supports
     # the "--track-origins" option...
     proc = ["valgrind", "--smc-check=all", "--leak-check=full",
             "--num-callers=30"]
 
     if self._options.show_all_leaks:
       proc += ["--show-reachable=yes"];
 
+    if self._options.trace_children:
+      proc += ["--trace-children=yes"];
+
     # Either generate suppressions or load them.
     if self._generate_suppressions:
       proc += ["--gen-suppressions=all"]
     else:
       proc += ["--xml=yes"]
 
     suppression_count = 0
     for suppression_file in self._suppressions:
       if os.path.exists(suppression_file):
         suppression_count += 1
         proc += ["--suppressions=%s" % suppression_file]
 
     if not suppression_count:
       logging.warning("WARNING: NOT USING SUPPRESSIONS!")
 
-    proc += ["--log-file=" + self.TMP_DIR + "/valgrind.%p"] + self._args
+    proc += ["--log-file=" + self.TMP_DIR + "/valgrind.%p"]
+
+    if self._options.indirect:
+      # The program being run invokes Python or something else
+      # that can't stand to be valgrinded, and also invokes
+      # the Chrome browser.  Set an environment variable to
+      # tell the program to prefix the Chrome commandline
+      # with a magic wrapper.  Build the magic wrapper here.
+      (fd, indirect_fname) = tempfile.mkstemp(dir=self.TMP_DIR, prefix="browser_wrapper.", text=True)
+      f = os.fdopen(fd, "w");
+      f.write("#!/bin/sh\n")
+      f.write(" ".join(proc))
+      f.write(' "$@"\n')
+      f.close()
+      os.chmod(indirect_fname, stat.S_IRUSR|stat.S_IXUSR)
+      os.putenv("BROWSER_WRAPPER", indirect_fname)
+      logging.info('export BROWSER_WRAPPER=' + indirect_fname);
+      proc = []
+
+    proc += self._args
     return proc
 
 
 class ValgrindMac(Valgrind):
 
   """Valgrind on Mac OS X.
 
   Valgrind on OS X does not support suppressions (yet).
   """
 
@@ skipping 41 matching lines @@
     valgrind = ValgrindMac()
     retcode = valgrind.Main()
     sys.exit(retcode)
   elif sys.platform == 'linux2': # Linux
     valgrind = ValgrindLinux()
     retcode = valgrind.Main()
     sys.exit(retcode)
   else:
     logging.error("Unknown platform: %s" % sys.platform)
     sys.exit(1)