Goal here is to collect total_coverage and unittests coverage numbers separately. Below are the ste…

build/scripts/slave/chromium/process_coverage.py

 #!/usr/bin/env 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.
 
 """A tool to run croc to generate code coverage, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 62 matching lines @@
 def main_linux(options, args):
   """Print appropriate size information about built Linux targets.
 
   Returns the first non-zero exit status of any command it executes,
   or zero on success.
 
   Assumes make, not scons.
   """
   target_dir = os.path.join(os.path.dirname(options.build_dir),
                             'out', options.target)
+  if os.path.exists(os.path.join(target_dir, 'total_coverage')):
+    print 'total_coverage directory exists'
+    total_cov_file = os.path.join(target_dir, 'total_coverage', 'coverage.info')
+    cmdline = [
+        sys.executable,
+        'src/tools/code_coverage/croc.py',
+        '-c', 'src/build/common.croc',
+        '-c', 'src/build/linux/chrome_linux.croc',
+        '-i', total_cov_file,
+        '-r', os.getcwd(),
+        '--tree',
+        '--html',
+        os.path.join(target_dir, 'total_coverage', 'coverage_croc_html'),
+        ]
+    main_common(total_cov_file, cmdline)
 
-  cov_file = os.path.join(target_dir, 'coverage.info')
-
-  cmdline = [
-      sys.executable,
-      'src/tools/code_coverage/croc.py',
-      '-c', 'src/build/common.croc',
-      '-c', 'src/build/linux/chrome_linux.croc',
-      '-i', cov_file,
-      '-r', os.getcwd(),
-      '--tree',
-      '--html', os.path.join(target_dir, 'coverage_croc_html'),
-      ]
-
-  return main_common(cov_file, cmdline)
+  if os.path.exists(os.path.join(target_dir, 'unittests_coverage')):
+    print 'unittests_coverage directory exists'
+    unittests_cov_file = os.path.join(target_dir, 'unittests_coverage', 'coverage.info')
+    cmdline = [
+        sys.executable,
+        'src/tools/code_coverage/croc.py',
+        '-c', 'src/build/common.croc',
+        '-c', 'src/build/linux/chrome_linux.croc',
+        '-i', unittests_cov_file,
+        '-r', os.getcwd(),
+        '--tree',
+        '--html',
+        os.path.join(target_dir, 'unittests_coverage', 'coverage_croc_html'),
+        ]
+    main_common(unittests_cov_file, cmdline)
+  return

[cmp, 2012/11/05 21:26:35]

I assume main_common returns something useful.  If so, instead of returning
None, you should return any exit return value of main_common here.

[pshenoy, 2012/11/05 21:52:14]

Done. Not sure how do I return the result of previous main_common() call. 

[cmp, 2012/11/05 21:59:29]

There are a couple approaches:
- add result values together (0 is success), but this gets confusing
- set result to 0 to start with, then set it to the result of the first
main_common(), then carefully call the second main_common() and either keep
result if the second main_common() is 0, or set result to the return value of
the second main_common()

[pshenoy, 2012/11/05 22:22:23]

Thanks. Done.

 
 
 def main_win(options, args):
   """Print appropriate size information about built Windows targets.
 
   Returns the first non-zero exit status of any command it executes,
   or zero on success.
   """
   target_dir = os.path.join(options.build_dir, options.target)
   cov_file = os.path.join(target_dir, 'coverage.info')
@@ skipping 53 matching lines @@
     else:
       sys.stderr.write('Unknown platform %s.\n' % repr(options.platform))
     msg = 'Use the --platform= option to specify a supported platform:\n'
     sys.stderr.write(msg + '    ' + ' '.join(platforms) + '\n')
     return 2
   return real_main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(main())