| 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 102c41b5bd5654c7b8a7ddb8d8c91742e564565d..6238fe13927d3187a0718d85fb041e298c0bf658 100644
|
| --- a/build/android/pylib/junit/test_runner.py
|
| +++ b/build/android/pylib/junit/test_runner.py
|
| @@ -19,7 +19,6 @@
|
| 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
|
| @@ -29,28 +28,17 @@
|
| with tempfile.NamedTemporaryFile() as json_file:
|
| java_script = os.path.join(
|
| constants.GetOutDirectory(), 'bin', 'helper', self._test_suite)
|
| - command = [java_script]
|
| -
|
| - # Add Jar arguments.
|
| - args = ['-test-jars', self._test_suite + '.jar',
|
| - '-json-results-file', json_file.name]
|
| + command = [java_script,
|
| + '-test-jars', self._test_suite + '.jar',
|
| + '-json-results-file', json_file.name]
|
| if self._test_filter:
|
| - args.extend(['-gtest-filter', self._test_filter])
|
| + command.extend(['-gtest-filter', self._test_filter])
|
| if self._package_filter:
|
| - args.extend(['-package-filter', self._package_filter])
|
| + command.extend(['-package-filter', self._package_filter])
|
| if self._runner_filter:
|
| - args.extend(['-runner-filter', self._runner_filter])
|
| + command.extend(['-runner-filter', self._runner_filter])
|
| if 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=%s' % self._coverage_dir)
|
| - if args:
|
| - command.extend(['--jvm-args', '"%s"' % ' '.join(args)])
|
| -
|
| + command.extend(['-sdk-version', self._sdk_version])
|
| return_code = cmd_helper.RunCmd(command)
|
| results_list = json_results.ParseResultsFromJson(
|
| json.loads(json_file.read()))
|
|
|