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:

[John Grabowski, 2012/10/30 21:29:05]

consider an unconditional delete.  It is unclear when we'd want to delete only
one of these.

[pshenoy, 2012/10/30 22:11:13]

coverage_posix.py is run twice now. First time running all the tests and storing
the coverage.info file in "total_coverage" folder. Second time running with
"all_unittests" flag set to run only unit tests. If delete is unconditional, it
will delete the "total_coverage" before process_coverage.py is executed.

[John Grabowski, 2012/10/30 22:17:11]

ok

+        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 209 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:

[John Grabowski, 2012/10/30 21:29:05]

make the conditional set a var called filename (either unittests_coverage or
total_coverage), then have the delete/copy/mkdir be unconditional.

[pshenoy, 2012/11/05 17:59:31]

I think this is related to the other comment above in this file. 

[John Grabowski, 2012/11/06 18:04:05]

Sort of, but it would be nice to be pithy.  For example, add a subroutine/method
called CopyCoverageFileToDestination() which is passed 'unittests_coverage' or
'total_coverage', and save a few lines of code.

[pshenoy, 2012/11/06 19:05:41]

Done.

+      unittests_dir = os.path.join(self.directory, 'unittests_coverage')
+      if not os.path.exists(unittests_dir):
+        os.makedirs(unittests_dir)
+      shutil.copyfile(self.coverage_info_file, os.path.join(unittests_dir,
+                                                            'coverage.info'))
+    else:
+      # Save the overall coverage information.
+      overall_dir = os.path.join(self.directory, 'total_coverage')
+      if not os.path.exists(overall_dir):
+        os.makedirs(overall_dir)
+      shutil.copyfile(self.coverage_info_file, os.path.join(overall_dir,
+                                                            'coverage.info'))
+
     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())