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

Side by Side Diff: testing/scripts/telemetry_perf_unittests.py

Issue 1331213004: [Android] Don't use a device blacklist if one isn't provided. (RELAND 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: + adb_install_apk.py blacklist Created 5 years, 3 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 | « testing/scripts/host_info.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import json 6 import json
7 import os 7 import os
8 import sys 8 import sys
9 9
10 10
11 import common 11 import common
12 12
13 13
14 def main_run(args): 14 def main_run(args):
15 filter_tests = [] 15 filter_tests = []
16 if args.filter_file: 16 if args.filter_file:
17 filter_tests = json.load(args.filter_file) 17 filter_tests = json.load(args.filter_file)
18 18
19 test_args = ['--retry-limit', '3'] 19 test_args = ['--retry-limit', '3']
20 if 'android' == args.properties.get('target_platform'): 20 if 'android' == args.properties.get('target_platform'):
21 test_args += ['--browser', 'android-chromium', '--device', 'android'] 21 test_args += [
22 '--browser', 'android-chromium',
23 '--device', 'android',
24 '--android-blacklist-file',
25 os.path.join(args.paths['checkout'], 'out', 'bad_devices.json'),
26 ]
22 else: 27 else:
23 test_args += ['--browser', args.build_config_fs.lower()] 28 test_args += ['--browser', args.build_config_fs.lower()]
24 29
25 with common.temporary_file() as tempfile_path: 30 with common.temporary_file() as tempfile_path:
26 test_args += ['--write-full-results-to', tempfile_path] 31 test_args += ['--write-full-results-to', tempfile_path]
27 rc = common.run_runtest(args, [ 32 rc = common.run_runtest(args, [
28 '--test-type', 'telemetry_perf_unittests', 33 '--test-type', 'telemetry_perf_unittests',
29 '--run-python-script', 34 '--run-python-script',
30 os.path.join(common.SRC_DIR, 'tools', 'perf', 'run_tests') 35 os.path.join(common.SRC_DIR, 'tools', 'perf', 'run_tests')
31 ] + test_args + filter_tests) 36 ] + test_args + filter_tests)
(...skipping 19 matching lines...) Expand all
51 else: 56 else:
52 json.dump(['chrome'], args.output) 57 json.dump(['chrome'], args.output)
53 58
54 59
55 if __name__ == '__main__': 60 if __name__ == '__main__':
56 funcs = { 61 funcs = {
57 'run': main_run, 62 'run': main_run,
58 'compile_targets': main_compile_targets, 63 'compile_targets': main_compile_targets,
59 } 64 }
60 sys.exit(common.run_script(sys.argv[1:], funcs)) 65 sys.exit(common.run_script(sys.argv[1:], funcs))
OLDNEW
« no previous file with comments | « testing/scripts/host_info.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698