Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: build/android/pylib/junit/test_runner.py

Issue 1674353004: [Android] Fix generated scripts for junit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Alphabetized the gyp includes everywhere. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/base.gyp ('k') | build/android/test_runner.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 from pylib.results import json_results 11 from pylib.results import json_results
12 12
13 class JavaTestRunner(object): 13 class JavaTestRunner(object):
14 """Runs java tests on the host.""" 14 """Runs java tests on the host."""
15 15
16 def __init__(self, args): 16 def __init__(self, args):
17 self._package_filter = args.package_filter 17 self._package_filter = args.package_filter
18 self._runner_filter = args.runner_filter 18 self._runner_filter = args.runner_filter
19 self._sdk_version = args.sdk_version 19 self._sdk_version = args.sdk_version
20 self._test_filter = args.test_filter 20 self._test_filter = args.test_filter
21 self._test_suite = args.test_suite 21 self._test_suite = args.test_suite
22 22
23 def SetUp(self): 23 def SetUp(self):
24 pass 24 pass
25 25
26 def RunTest(self, _test): 26 def RunTest(self, _test):
27 """Runs junit tests from |self._test_suite|.""" 27 """Runs junit tests from |self._test_suite|."""
28 with tempfile.NamedTemporaryFile() as json_file: 28 with tempfile.NamedTemporaryFile() as json_file:
29 java_script = os.path.join( 29 java_script = os.path.join(
30 constants.GetOutDirectory(), 'bin', self._test_suite) 30 constants.GetOutDirectory(), 'bin', 'helper', self._test_suite)
31 command = [java_script, 31 command = [java_script,
32 '-test-jars', self._test_suite + '.jar', 32 '-test-jars', self._test_suite + '.jar',
33 '-json-results-file', json_file.name] 33 '-json-results-file', json_file.name]
34 if self._test_filter: 34 if self._test_filter:
35 command.extend(['-gtest-filter', self._test_filter]) 35 command.extend(['-gtest-filter', self._test_filter])
36 if self._package_filter: 36 if self._package_filter:
37 command.extend(['-package-filter', self._package_filter]) 37 command.extend(['-package-filter', self._package_filter])
38 if self._runner_filter: 38 if self._runner_filter:
39 command.extend(['-runner-filter', self._runner_filter]) 39 command.extend(['-runner-filter', self._runner_filter])
40 if self._sdk_version: 40 if self._sdk_version:
41 command.extend(['-sdk-version', self._sdk_version]) 41 command.extend(['-sdk-version', self._sdk_version])
42 return_code = cmd_helper.RunCmd(command) 42 return_code = cmd_helper.RunCmd(command)
43 results_list = json_results.ParseResultsFromJson( 43 results_list = json_results.ParseResultsFromJson(
44 json.loads(json_file.read())) 44 json.loads(json_file.read()))
45 return (results_list, return_code) 45 return (results_list, return_code)
46 46
47 def TearDown(self): 47 def TearDown(self):
48 pass 48 pass
49 49
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | build/android/test_runner.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698