Chromium Code Reviews| Index: build/android/pylib/local/machine/local_machine_junit_test_run.py |
| diff --git a/build/android/pylib/local/machine/local_machine_junit_test_run.py b/build/android/pylib/local/machine/local_machine_junit_test_run.py |
| index ef8bef4f1aee411d0ed6e2a1cddd93926b175793..f1f81cba0f9340a1f047c696f1dcba9665da67a3 100644 |
| --- a/build/android/pylib/local/machine/local_machine_junit_test_run.py |
| +++ b/build/android/pylib/local/machine/local_machine_junit_test_run.py |
| @@ -30,7 +30,7 @@ class LocalMachineJunitTestRun(test_run.TestRun): |
| with tempfile.NamedTemporaryFile() as json_file: |
| java_script = os.path.join( |
| constants.GetOutDirectory(), 'bin', 'helper', |
| - self._test_instance.suite) |
| + self._test_instance.suite) |
|
agrieve
2017/03/30 17:09:54
whoops, random whitespace change.
ScottK
2017/04/04 21:03:02
Fixed, but I've also split this to another cr/2788
|
| command = [java_script] |
| # Add Jar arguments. |
| @@ -50,9 +50,11 @@ class LocalMachineJunitTestRun(test_run.TestRun): |
| # TODO(mikecase): Add a --robolectric-dep-dir arg to test runner. |
| # Have this arg set by GN in the generated test runner scripts. |
| jvm_args += [ |
| - '-Drobolectric.dependency.dir=%s' % |
| - os.path.join(constants.GetOutDirectory(), |
| - 'lib.java', 'third_party', 'robolectric')] |
| + '-Drobolectric.dependency.dir=%s' % os.path.join( |
| + constants.GetOutDirectory(), 'lib.java', 'third_party', |
| + 'robolectric'), |
| + '-Ddir.source.root=%s' % constants.DIR_SOURCE_ROOT, |
| + ] |
| if self._test_instance.coverage_dir: |
| if not os.path.exists(self._test_instance.coverage_dir): |
| os.makedirs(self._test_instance.coverage_dir) |