Avoid duplicate error reports / suppressions when UI test reports are...

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.
 
 # valgrind_test.py
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
@@ skipping 419 matching lines @@
   def GetAnalyzeResults(self, check_sanity=False):
     # Glob all the files in the "testing.tmp" directory
     filenames = glob.glob(self.TMP_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:
       # Fast path - no browser wrapper was set.
-      return self.CreateAnalyzer(filenames).Report(check_sanity)
+      return analyzer.Report(filenames, check_sanity)
 
     ret = 0
     for ppid in ppids:
       print "====================================================="
       print " Below is the report for valgrind wrapper PID=%d." % ppid
       print " You can find the corresponding test "
       print " by searching the above log for 'PID=%d'" % ppid
       sys.stdout.flush()
 
       ppid_filenames = [f for f in filenames \
                         if re.search("\.%d\.[0-9]+$" % ppid, f)]
       # check_sanity won't work with browser wrappers
       assert check_sanity == False
-      ret |= self.CreateAnalyzer(ppid_filenames).Report()
+      ret |= analyzer.Report(ppid_filenames)
       print "====================================================="
       sys.stdout.flush()
 
     if ret != 0:
       print ""
       print "The Valgrind reports are grouped by test names."
       print "Each test has its PID printed in the log when the test was run"
       print "and at the beginning of its Valgrind report."
       sys.stdout.flush()
 
@@ skipping 28 matching lines @@
     if self._options.show_all_leaks:
       ret += ["--show-reachable=yes"]
     else:
       ret += ["--show-possible=no"]
 
     if self._options.track_origins:
       ret += ["--track-origins=yes"]
 
     return ret
 
-  def CreateAnalyzer(self, filenames):
+  def CreateAnalyzer(self):
     use_gdb = common.IsMac()
-    return memcheck_analyze.MemcheckAnalyze(self._source_dir, filenames,
+    return memcheck_analyze.MemcheckAnalyzer(self._source_dir,
                                             self._options.show_all_leaks,
                                             use_gdb=use_gdb)
 
   def Analyze(self, check_sanity=False):
     ret = self.GetAnalyzeResults(check_sanity)
 
     if ret != 0:
       logging.info("Please see http://dev.chromium.org/developers/how-tos/"
                    "using-valgrind for the info on Memcheck/Valgrind")
     return ret
@@ skipping 131 matching lines @@
     ValgrindTool.__init__(self)
     ThreadSanitizerBase.__init__(self)
 
   def ToolSpecificFlags(self):
     proc = ThreadSanitizerBase.ToolSpecificFlags(self)
     # The -v flag is needed for printing the list of used suppressions and
     # obtaining addresses for loaded shared libraries on Mac.
     proc += ["-v"]
     return proc
 
-  def CreateAnalyzer(self, filenames):
+  def CreateAnalyzer(self):
     use_gdb = common.IsMac()
-    return tsan_analyze.TsanAnalyze(self._source_dir, filenames)
+    return tsan_analyze.TsanAnalyzer(self._source_dir)
 
   def Analyze(self, check_sanity=False):
     ret = self.GetAnalyzeResults(check_sanity)
 
     if ret != 0:
       logging.info(self.INFO_MESSAGE)
     return ret
 
 class ThreadSanitizerWindows(ThreadSanitizerBase, PinTool):
   def __init__(self):
@@ skipping 23 matching lines @@
     logfilename = self.TMP_DIR + "/tsan.%p"
     proc += ["--log-file=" + logfilename]
 
     # TODO(timurrrr): Add flags for Valgrind trace children analog when we
     # start running complex tests (e.g. UI) under TSan/Win.
 
     return proc
 
   def Analyze(self, check_sanity=False):
     filenames = glob.glob(self.TMP_DIR + "/tsan.*")
-    analyzer = tsan_analyze.TsanAnalyze(self._source_dir, filenames)
-    ret = analyzer.Report(check_sanity)
+    analyzer = tsan_analyze.TsanAnalyzer(self._source_dir)
+    ret = analyzer.Report(filenames, check_sanity)
     if ret != 0:
       logging.info(self.INFO_MESSAGE)
     return ret
 
 
 class DrMemory(BaseTool):
   """Dr.Memory
   Dynamic memory error detector for Windows.
 
   http://dynamorio.org/drmemory.html
@@ skipping 99 matching lines @@
 
 if __name__ == "__main__":
   if sys.argv.count("-v") > 0 or sys.argv.count("--verbose") > 0:
     logging_utils.config_root(logging.DEBUG)
   else:
     logging_utils.config_root()
   # TODO(timurrrr): valgrind tools may use -v/--verbose as well
 
   ret = RunTool(sys.argv)
   sys.exit(ret)