Set up python BROWSER_WRAPPER for ui_tests under Dr. Memory

tools/valgrind/valgrind_test.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 # valgrind_test.py
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
@@ skipping 418 matching lines @@
 
     f.close()
     os.chmod(indirect_fname, stat.S_IRUSR|stat.S_IXUSR)
     return indirect_fname
 
   def CreateAnalyzer(self):
     raise NotImplementedError, "This method should be implemented " \
                                "in the tool-specific subclass"
 
   def GetAnalyzeResults(self, check_sanity=False):
-    # Glob all the files in the "testing.tmp" directory
+    # Glob all the files in the log directory
     filenames = glob.glob(self.log_dir + "/" + self.ToolName() + ".*")
 
     # If we have browser wrapper, the logfiles are named as
     # "toolname.wrapper_PID.valgrind_PID".
     # Let's extract the list of wrapper_PIDs and name it ppids
     ppids = set([int(f.split(".")[-2]) \
                 for f in filenames if re.search("\.[0-9]+\.[0-9]+$", f)])
 
     analyzer = self.CreateAnalyzer()
     if len(ppids) == 0:
@@ skipping 422 matching lines @@
 
     if not self.handle_uninits_and_leaks:
       proc += ["-no_check_uninitialized", "-no_count_leaks"]
 
     proc += self._tool_flags
 
     # Dr.Memory requires -- to separate tool flags from the executable name.
     proc += ["--"]
 
     if self._options.indirect:
-      self.CreateBrowserWrapper(" ".join(proc))
+      # TODO(timurrrr): reuse for TSan on Windows
+      self.CreateBrowserWrapper(" ".join(
+            ["python", "tools/valgrind/browser_wrapper_win.py"] + proc))
       proc = []
 
     # Note that self._args begins with the name of the exe to be run.
     self._args[0] = common.NormalizeWindowsPath(self._args[0])
     proc += self._args
     return proc
 
   def CreateBrowserWrapper(self, command):
     os.putenv("BROWSER_WRAPPER", command)
 
   def Analyze(self, check_sanity=False):
-    # Glob all the results files in the "testing.tmp" directory
-    filenames = glob.glob(self.log_dir + "/*/results.txt")
+    # Use one analyzer for all the log files to avoid printing duplicate reports
+    #
+    # TODO(timurrrr): unify this with Valgrind and other tools when we have
+    # http://code.google.com/p/drmemory/issues/detail?id=684
+    analyzer = drmemory_analyze.DrMemoryAnalyzer()
 
-    analyzer = drmemory_analyze.DrMemoryAnalyze(self._source_dir, filenames)
-    ret = analyzer.Report(check_sanity)
+    ret = 0
+    if not self._options.indirect:
+      filenames = glob.glob(self.log_dir + "/*/results.txt")
+
+      ret = analyzer.Report(filenames, None, check_sanity)
+    else:
+      testcases = glob.glob(self.log_dir + "/testcase.*.logs")
+      # If we have browser wrapper, the per-test logdirs are named as
+      # "testcase.wrapper_PID".
+      # Let's extract the list of wrapper_PIDs and name it ppids
+      ppids = set([int(f.split(".")[-2]) for f in testcases])
+
+      for ppid in ppids:
+        testcase_name = None
+        try:
+          f = open(self.log_dir + ("/testcase.%d.name" % ppid))
+          testcase_name = f.read().strip()
+          f.close()
+        except IOError:
+          pass
+        print "====================================================="
+        print " Below is the report for drmemory wrapper PID=%d." % ppid
+        if testcase_name:
+          print " It was used while running the `%s` test." % testcase_name
+        else:
+          # TODO(timurrrr): hm, the PID line is suppressed on Windows...
+          print " You can find the corresponding test"
+          print " by searching the above log for 'PID=%d'" % ppid
+        sys.stdout.flush()
+        ppid_filenames = glob.glob("%s/testcase.%d.logs/*/results.txt" %
+                                   (self.log_dir, ppid))
+        ret |= analyzer.Report(ppid_filenames, testcase_name, False)
+        print "====================================================="
+        sys.stdout.flush()
+
+    logging.info("Please see http://dev.chromium.org/developers/how-tos/"
+                 "using-drmemory for the info on Dr. Memory")
     return ret
 
 
 # RaceVerifier support. See
 # http://code.google.com/p/data-race-test/wiki/RaceVerifier for more details.
 class ThreadSanitizerRV1Analyzer(tsan_analyze.TsanAnalyzer):
   """ TsanAnalyzer that saves race reports to a file. """
 
   TMP_FILE = "rvlog.tmp"
 
@@ skipping 236 matching lines @@
       platform_name = sys.platform + "(Unknown)"
     raise RuntimeError, "Unknown tool (tool=%s, platform=%s)" % (tool_name,
                                                                  platform_name)
 
 def CreateTool(tool):
   return ToolFactory().Create(tool)
 
 if __name__ == '__main__':
   logging.error(sys.argv[0] + " can not be run from command line")
   sys.exit(1)