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..f9ac1694f8593bea4c098087c16421aa4446d931 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,17 +29,28 @@ 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.
+      args = ['-test-jars', self._test_suite + '.jar',
+          '-json-results-file', json_file.name]

[mikecase (-- gone --), 2016/05/10 19:24:46]

nit: Line up the indents.


args = ['-test-jars', self._test_suite + '.jar',
        '-json-results-file', json_file.name]

[BigBossZhiling, 2016/05/10 19:34:26]

Done.

       if self._test_filter:
-        command.extend(['-gtest-filter', self._test_filter])
+        args.extend(['-gtest-filter', self._test_filter])
       if self._package_filter:
-        command.extend(['-package-filter', self._package_filter])
+        args.extend(['-package-filter', self._package_filter])
       if self._runner_filter:
-        command.extend(['-runner-filter', self._runner_filter])
+        args.extend(['-runner-filter', self._runner_filter])
       if self._sdk_version:
-        command.extend(['-sdk-version', self._sdk_version])
+        args.extend(['-sdk-version', self._sdk_version])
+      command.extend(['--jar-args', '"%s"' % ' '.join(args)])
+
+      # Add JVM arguments.
+      args = []
+      if self._coverage_dir:
+        args.append('-Demma.coverage.out.file=' + self._coverage_dir)
+      if args:
+        command.extend(['--jvm-args', '"%s"' % ' '.join(args)])
+
       return_code = cmd_helper.RunCmd(command)
       results_list = json_results.ParseResultsFromJson(
           json.loads(json_file.read()))