[Android] Add a cleanup option to generate_emma_html.py.

This gets rid of any old *.em/*.ec files.

BUG=278365
NOTRY=True

Review URL: https://chromiumcodereview.appspot.com/23506003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219839 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 7 deletions

diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index e72ba1e..b8a1b84 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -349,6 +349,7 @@ def GenerateJavaCoverageReport(options):
   RunCmd(['build/android/generate_emma_html.py',
           '--coverage-dir', options.coverage_dir,
           '--metadata-dir', os.path.join(CHROME_SRC, 'out', options.target),
+          '--cleanup',
           '--output', os.path.join(coverage_html, 'index.html')])
   UploadCoverageData(options, coverage_html, 'java')
 
@@ -385,9 +386,6 @@ def MainTestWrapper(options):
       test_obj = INSTRUMENTATION_TESTS[options.install]
       InstallApk(options, test_obj, print_step=True)
 
-    if options.coverage_bucket:
-      RunCmd(['rm', '-rf', options.coverage_dir])
-
     if options.test_filter:
       bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)
 
diff --git a/build/android/generate_emma_html.py b/build/android/generate_emma_html.py
index a226343..1b00a329 100755
--- a/build/android/generate_emma_html.py
+++ b/build/android/generate_emma_html.py
@@ -38,17 +38,19 @@ def _GetFilesWithExt(root_dir, ext):
 
 def main(argv):
   option_parser = optparse.OptionParser()
-  option_parser.add_option('-o', '--output', help='HTML output filename.')
-  option_parser.add_option('-c', '--coverage-dir', default=None,
+  option_parser.add_option('--output', help='HTML output filename.')
+  option_parser.add_option('--coverage-dir', default=None,
                            help=('Root of the directory in which to search for '
                                  'coverage data (.ec) files.'))
-  option_parser.add_option('-m', '--metadata-dir', default=None,
+  option_parser.add_option('--metadata-dir', default=None,
                            help=('Root of the directory in which to search for '
                                  'coverage metadata (.em) files.'))
+  option_parser.add_option('--cleanup', action='store_true',
+                           help='If set, removes coverage/metadata files.')
   options, args = option_parser.parse_args()
 
   if not (options.coverage_dir and options.metadata_dir and options.output):
-    option_parser.error('All arguments are required.')
+    option_parser.error('One or more mandatory options are missing.')
 
   coverage_files = _GetFilesWithExt(options.coverage_dir, 'ec')
   metadata_files = _GetFilesWithExt(options.metadata_dir, 'em')
@@ -88,6 +90,10 @@ def main(argv):
        'emma', 'report', '-r', 'html']
       + input_args + output_args + source_args)
 
+  if options.cleanup:
+    for f in coverage_files + metadata_files:
+      os.remove(f)
+
   if exit_code > 0:
     return exit_code
   elif err: