OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2015 The Chromium Authors. All rights reserved. | 2 # Copyright 2015 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 |
(...skipping 30 matching lines...) Expand all Loading... |
41 ] | 41 ] |
42 | 42 |
43 if 'android' == args.properties.get('target_platform'): | 43 if 'android' == args.properties.get('target_platform'): |
44 gtest_args.extend([ | 44 gtest_args.extend([ |
45 '--no-xvfb', | 45 '--no-xvfb', |
46 '--run-python-script', os.path.join( | 46 '--run-python-script', os.path.join( |
47 args.paths['checkout'], 'out', args.build_config_fs, 'bin', | 47 args.paths['checkout'], 'out', args.build_config_fs, 'bin', |
48 'run_%s' % test_suite), | 48 'run_%s' % test_suite), |
49 '--verbose', | 49 '--verbose', |
50 ]) | 50 ]) |
| 51 gtest_args.extend(script_args[1:]) |
51 else: | 52 else: |
52 gtest_args.extend(['--xvfb']) | 53 gtest_args.extend(['--xvfb']) |
53 gtest_args.extend(script_args) | 54 gtest_args.extend(script_args) |
54 | 55 |
55 rc = common.run_runtest(args, gtest_args + filter_tests) | 56 rc = common.run_runtest(args, gtest_args + filter_tests) |
56 | 57 |
57 with open(tempfile_path) as f: | 58 with open(tempfile_path) as f: |
58 results = json.load(f) | 59 results = json.load(f) |
59 | 60 |
60 json.dump({ | 61 json.dump({ |
(...skipping 10 matching lines...) Expand all Loading... |
71 else: | 72 else: |
72 json.dump(['$name'], args.output) | 73 json.dump(['$name'], args.output) |
73 | 74 |
74 | 75 |
75 if __name__ == '__main__': | 76 if __name__ == '__main__': |
76 funcs = { | 77 funcs = { |
77 'run': main_run, | 78 'run': main_run, |
78 'compile_targets': main_compile_targets, | 79 'compile_targets': main_compile_targets, |
79 } | 80 } |
80 sys.exit(common.run_script(sys.argv[1:], funcs)) | 81 sys.exit(common.run_script(sys.argv[1:], funcs)) |
OLD | NEW |