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 29 matching lines...) Expand all Loading... | |
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 if self._coverage_dir: | 49 if self._coverage_dir: |
50 jvm_args.append('-Demma.coverage.out.file=%s' % self._coverage_dir) | 50 jvm_args.append('-Demma.coverage.out.file=%s' % os.path.join( |
jbudorick
2016/05/24 12:35:18
This should check that self._coverage_dir exists a
BigBossZhiling
2016/05/24 17:41:33
That's a good point, but I just tested on it and i
jbudorick
2016/05/24 19:15:09
I'd still prefer we create it here.
BigBossZhiling
2016/05/24 19:28:52
Done.
| |
51 self._coverage_dir, '%s.ec' % self._test_suite)) | |
51 if jvm_args: | 52 if jvm_args: |
52 command.extend(['--jvm-args', '"%s"' % ' '.join(jvm_args)]) | 53 command.extend(['--jvm-args', '"%s"' % ' '.join(jvm_args)]) |
53 | 54 |
54 return_code = cmd_helper.RunCmd(command) | 55 return_code = cmd_helper.RunCmd(command) |
55 results_list = json_results.ParseResultsFromJson( | 56 results_list = json_results.ParseResultsFromJson( |
56 json.loads(json_file.read())) | 57 json.loads(json_file.read())) |
57 return (results_list, return_code) | 58 return (results_list, return_code) |
58 | 59 |
59 def TearDown(self): | 60 def TearDown(self): |
60 pass | 61 pass |
61 | 62 |
OLD | NEW |