| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import json | 5 import json |
| 6 import os | 6 import os |
| 7 import tempfile | 7 import tempfile |
| 8 | 8 |
| 9 from devil.utils import cmd_helper | 9 from devil.utils import cmd_helper |
| 10 from pylib import constants | 10 from pylib import constants |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 if self._package_filter: | 39 if self._package_filter: |
| 40 jar_args.extend(['-package-filter', self._package_filter]) | 40 jar_args.extend(['-package-filter', self._package_filter]) |
| 41 if self._runner_filter: | 41 if self._runner_filter: |
| 42 jar_args.extend(['-runner-filter', self._runner_filter]) | 42 jar_args.extend(['-runner-filter', self._runner_filter]) |
| 43 if self._sdk_version: | 43 if self._sdk_version: |
| 44 jar_args.extend(['-sdk-version', self._sdk_version]) | 44 jar_args.extend(['-sdk-version', self._sdk_version]) |
| 45 command.extend(['--jar-args', '"%s"' % ' '.join(jar_args)]) | 45 command.extend(['--jar-args', '"%s"' % ' '.join(jar_args)]) |
| 46 | 46 |
| 47 # Add JVM arguments. | 47 # Add JVM arguments. |
| 48 jvm_args = [] | 48 jvm_args = [] |
| 49 # TODO(mikecase): Add a --robolectric-dep-dir arg to test runner. |
| 50 # Have this arg set by GN in the generated test runner scripts. |
| 51 jvm_args += [ |
| 52 '-Drobolectric.dependency.dir=%s' % |
| 53 os.path.join(constants.GetOutDirectory(), |
| 54 'lib.java', 'third_party', 'robolectric')] |
| 49 if self._coverage_dir: | 55 if self._coverage_dir: |
| 50 if not os.path.exists(self._coverage_dir): | 56 if not os.path.exists(self._coverage_dir): |
| 51 os.makedirs(self._coverage_dir) | 57 os.makedirs(self._coverage_dir) |
| 52 elif not os.path.isdir(self._coverage_dir): | 58 elif not os.path.isdir(self._coverage_dir): |
| 53 raise Exception('--coverage-dir takes a directory, not file path.') | 59 raise Exception('--coverage-dir takes a directory, not file path.') |
| 54 jvm_args.append('-Demma.coverage.out.file=%s' % os.path.join( | 60 jvm_args.append('-Demma.coverage.out.file=%s' % os.path.join( |
| 55 self._coverage_dir, '%s.ec' % self._test_suite)) | 61 self._coverage_dir, '%s.ec' % self._test_suite)) |
| 56 if jvm_args: | 62 if jvm_args: |
| 57 command.extend(['--jvm-args', '"%s"' % ' '.join(jvm_args)]) | 63 command.extend(['--jvm-args', '"%s"' % ' '.join(jvm_args)]) |
| 58 | 64 |
| 59 return_code = cmd_helper.RunCmd(command) | 65 return_code = cmd_helper.RunCmd(command) |
| 60 results_list = json_results.ParseResultsFromJson( | 66 results_list = json_results.ParseResultsFromJson( |
| 61 json.loads(json_file.read())) | 67 json.loads(json_file.read())) |
| 62 return (results_list, return_code) | 68 return (results_list, return_code) |
| 63 | 69 |
| 64 def TearDown(self): | 70 def TearDown(self): |
| 65 pass | 71 pass |
| 66 | 72 |
| OLD | NEW |