Print out the ui_test test case in the reports

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 379 matching lines @@
     appropriately.
     """
     command = " ".join(proc)
     command = command.replace("%p", "$$.%p")
 
     (fd, indirect_fname) = tempfile.mkstemp(dir=self.log_dir,
                                             prefix="browser_wrapper.",
                                             text=True)
     f = os.fdopen(fd, "w")
     f.write("#!/bin/sh\n")
-    f.write('echo "Started Valgrind wrapper for this test, PID=$$"\n')
+    f.write('echo "Started Valgrind wrapper for this test, PID=$$"\n\n')
+    f.write('for arg in $@\ndo\n')
+    f.write('  if [[ "$arg" =~ --test-name=(.*) ]]\n then\n')
+    f.write('    TESTCASE=${BASH_REMATCH[1]}\n')
+    f.write('    echo $TESTCASE >`dirname $0`/testcase.$$.name\n')
+    f.write('  fi\ndone\n')
     # Add the PID of the browser wrapper to the logfile names so we can
     # separate log files for different UI tests at the analyze stage.
     f.write(command)
     f.write(' "$@"\n')
     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
     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:
       # Fast path - no browser wrapper was set.
-      return analyzer.Report(filenames, check_sanity)
+      return analyzer.Report(filenames, None, check_sanity)
 
     ret = 0
     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 valgrind wrapper PID=%d." % ppid
-      print " You can find the corresponding test"
-      print " by searching the above log for 'PID=%d'" % ppid
+      if testcase_name:
+        print " It was used while running the `%s` test." % testcase_name
+      else:
+        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 |= analyzer.Report(ppid_filenames)
+      ret |= analyzer.Report(ppid_filenames, testcase_name)
       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."
+      print "Hint: you can search for the reports by Ctrl+F -> `=#`"
       sys.stdout.flush()
 
     return ret
 
 
 # TODO(timurrrr): Split into a separate file.
 class Memcheck(ValgrindTool):
   """Memcheck
   Dynamic memory error detector for Linux & Mac
 
@@ skipping 234 matching lines @@
     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.log_dir + "/tsan.*")
     analyzer = tsan_analyze.TsanAnalyzer(self._source_dir)
-    ret = analyzer.Report(filenames, check_sanity)
+    ret = analyzer.Report(filenames, None, check_sanity)
     if ret != 0:
       logging.info(self.INFO_MESSAGE)
     return ret
 
 
 class DrMemory(BaseTool):
   """Dr.Memory
   Dynamic memory error detector for Windows.
 
   http://dev.chromium.org/developers/how-tos/using-drmemory
@@ skipping 386 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)