Add directory option for JUnit coverage files.

build/android/pylib/junit/test_runner.py

Index: build/android/pylib/junit/test_runner.py
diff --git a/build/android/pylib/junit/test_runner.py b/build/android/pylib/junit/test_runner.py
index 6238fe13927d3187a0718d85fb041e298c0bf658..ca5b18d7a904cb9a8dcb82476e1f26f32a6071a7 100644
--- a/build/android/pylib/junit/test_runner.py
+++ b/build/android/pylib/junit/test_runner.py
@@ -19,6 +19,7 @@ class JavaTestRunner(object):
     self._sdk_version = args.sdk_version
     self._test_filter = args.test_filter
     self._test_suite = args.test_suite
+    self._coverage_dir = args.coverage_dir
 
   def SetUp(self):
     pass
@@ -28,9 +29,12 @@ class JavaTestRunner(object):
     with tempfile.NamedTemporaryFile() as json_file:
       java_script = os.path.join(
           constants.GetOutDirectory(), 'bin', 'helper', self._test_suite)
-      command = [java_script,
-                 '-test-jars', self._test_suite + '.jar',
-                 '-json-results-file', json_file.name]
+      command = [java_script]
+
+      # Add Jar arguments.
+      command.append('-jar-args')

[jbudorick, 2016/05/09 23:51:49]

This should be:

  args = ['-test-jars', self._test_suite + '.jar', '-json-results-file',
json_file.name]
  if self._test_filter:
    args.extend(['-gtest-filter', self._test_filter])
  # etc

  command.extend([
      '--jar-args',
      cmd_helper.SingleQuote(' '.join(args))
  ])

  if self._coverage_dir:
    command.extend([
        '--jvm-args',
        cmd_helper.SingleQuote('-Demma.coverage.out.file=' + self._coverage_dir)
    ])

[jbudorick, 2016/05/10 18:34:11]

instead of cmd_helper.SingleQuote, just do

  '"%s"' % ('-Demma.coverage.out.file=' + self._coverage_dir)

+      command.extend(['-test-jars', self._test_suite + '.jar',
+          '-json-results-file', json_file.name])
       if self._test_filter:
         command.extend(['-gtest-filter', self._test_filter])
       if self._package_filter:
@@ -39,6 +43,11 @@ class JavaTestRunner(object):
         command.extend(['-runner-filter', self._runner_filter])
       if self._sdk_version:
         command.extend(['-sdk-version', self._sdk_version])
+
+      # Add JVM arguments.
+      command.append('-jvm-args')
+      if self._coverage_dir:
+        command.append('-Demma.coverage.out.file=' + self._coverage_dir)
       return_code = cmd_helper.RunCmd(command)
       results_list = json_results.ParseResultsFromJson(
           json.loads(json_file.read()))