OLD | NEW |
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 with common.temporary_file() as tempfile_path: | 19 with common.temporary_file() as tempfile_path: |
20 rc = common.run_command([ | 20 rc = common.run_command([ |
21 sys.executable, | 21 sys.executable, |
22 os.path.join(args.paths['build'], 'scripts', 'tools', 'runit.py'), | 22 os.path.join(args.paths['build'], 'scripts', 'tools', 'runit.py'), |
23 '--show-path', | 23 '--show-path', |
| 24 sys.executable, |
24 os.path.join(args.paths['build'], 'scripts', 'slave', 'runtest.py'), | 25 os.path.join(args.paths['build'], 'scripts', 'slave', 'runtest.py'), |
25 '--target', args.build_config_fs, | 26 '--target', args.build_config_fs, |
26 '--xvfb', | 27 '--xvfb', |
27 '--annotate', 'gtest', | 28 '--annotate', 'gtest', |
28 '--test-type', 'telemetry_unittests', | 29 '--test-type', 'telemetry_unittests', |
29 '--builder-name', args.properties['buildername'], | 30 '--builder-name', args.properties['buildername'], |
30 '--slave-name', args.properties['slavename'], | 31 '--slave-name', args.properties['slavename'], |
31 '--build-number', str(args.properties['buildnumber']), | 32 '--build-number', str(args.properties['buildnumber']), |
32 '--run-python-script', | 33 '--run-python-script', |
33 os.path.join(common.SRC_DIR, 'tools', 'telemetry', 'run_tests'), | 34 os.path.join(common.SRC_DIR, 'tools', 'telemetry', 'run_tests'), |
(...skipping 20 matching lines...) Expand all Loading... |
54 def main_compile_targets(args): | 55 def main_compile_targets(args): |
55 json.dump(['chrome'], args.output) | 56 json.dump(['chrome'], args.output) |
56 | 57 |
57 | 58 |
58 if __name__ == '__main__': | 59 if __name__ == '__main__': |
59 funcs = { | 60 funcs = { |
60 'run': main_run, | 61 'run': main_run, |
61 'compile_targets': main_compile_targets, | 62 'compile_targets': main_compile_targets, |
62 } | 63 } |
63 sys.exit(common.run_script(sys.argv[1:], funcs)) | 64 sys.exit(common.run_script(sys.argv[1:], funcs)) |
OLD | NEW |