Store coverage.info file in separate folders based on commandline parameters to coverage_posix.py.

tools/code_coverage/coverage_posix.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Generate and process code coverage.
 
 TODO(jrg): rename this from coverage_posix.py to coverage_all.py!
 
 Written for and tested on Mac, Linux, and Windows.  To use this script
@@ skipping 744 matching lines @@
       print 'Clearing of coverage data NOT performed.'
       return
     print 'Clearing coverage data from previous runs.'
     if os.path.exists(self.coverage_info_file):
       os.remove(self.coverage_info_file)
     if self.IsPosix():
       subprocess.call([self.lcov,
                        '--directory', self.directory_parent,
                        '--zerocounters'])
       shutil.rmtree(os.path.join(self.directory, 'coverage'))
+      if self.options.all_unittests:
+        if os.path.exists(os.path.join(self.directory, 'unittests_coverage')):
+          shutil.rmtree(os.path.join(self.directory, 'unittests_coverage'))
+      else:
+        if os.path.exists(os.path.join(self.directory, 'total_coverage')):
+          shutil.rmtree(os.path.join(self.directory, 'total_coverage'))
 
   def BeforeRunOneTest(self, testname):
     """Do things before running each test."""
     if not self.IsWindows():
       return
     # Stop old counters if needed
     cmdlist = [self.perf, '-shutdown']
     self.Run(cmdlist, ignore_error=True)
     # Instrument binaries
     for fulltest in self.tests:
@@ skipping 166 matching lines @@
     """Stop Xvfb if needed.  Linux only."""
     if self.xvfb_pid:
       logging.info('Xvfb: killing')
       try:
         os.kill(self.xvfb_pid, signal.SIGKILL)
       except:
         pass
       del os.environ['DISPLAY']
       self.xvfb_pid = 0
 
+  def CopyCoverageFileToDestination(self, coverage_folder):
+    coverage_dir = os.path.join(self.directory, coverage_folder)
+    if not os.path.exists(coverage_dir):
+      os.makedirs(coverage_dir)
+    shutil.copyfile(self.coverage_info_file, os.path.join(coverage_dir,
+                                                          'coverage.info'))
 
   def GenerateLcovPosix(self):
     """Convert profile data to lcov on Mac or Linux."""
     start_dir = os.getcwd()
     logging.info('GenerateLcovPosix: start_dir=' + start_dir)
     if self.IsLinux():
       # With Linux/make (e.g. the coverage_run target), the current
       # directory for this command is .../build/src/chrome but we need
       # to be in .../build/src for the relative path of source files
       # to be correct.  However, when run from buildbot, the current
@@ skipping 23 matching lines @@
                os.path.join(start_dir, self.coverage_info_file)]
     logging.info('Assembly command: ' + ' '.join(command))
     retcode = subprocess.call(command)
     if retcode:
       logging.fatal('COVERAGE: %s failed; return code: %d' %
                     (command[0], retcode))
       if self.options.strict:
         sys.exit(retcode)
     if self.IsLinux():
       os.chdir(start_dir)
+
+    # Copy the unittests coverage information to a different folder.
+    if self.options.all_unittests:
+      self.CopyCoverageFileToDestination('unittests_coverage')
+    else:
+      # Save the overall coverage information.
+      self.CopyCoverageFileToDestination('total_coverage')
+
     if not os.path.exists(self.coverage_info_file):
       logging.fatal('%s was not created.  Coverage run failed.' %
                     self.coverage_info_file)
       sys.exit(1)
 
   def GenerateLcovWindows(self, testname=None):
     """Convert VSTS format to lcov.  Appends coverage data to sum file."""
     lcov_file = self.vsts_output + '.lcov'
     if os.path.exists(lcov_file):
       os.remove(lcov_file)
@@ skipping 138 matching lines @@
   if options.trim:
     coverage.TrimTests()
   coverage.RunTests()
   if options.genhtml:
     coverage.GenerateHtml()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())