| 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 26 matching lines...) Expand all Loading... |
| 37 '--builder-name', args.properties.get('buildername'), | 37 '--builder-name', args.properties.get('buildername'), |
| 38 '--build-number', str(args.properties.get('buildnumber')), | 38 '--build-number', str(args.properties.get('buildnumber')), |
| 39 '--log-processor-output-file', tempfile_path, | 39 '--log-processor-output-file', tempfile_path, |
| 40 '--test-type', test_suite, | 40 '--test-type', test_suite, |
| 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'], 'build', 'android', 'test_runner.py'), | 47 args.paths['checkout'], 'out', args.build_config_fs, 'bin', |
| 48 'gtest', '--release', | 48 'run_%s' % test_suite), |
| 49 '--suite', test_suite, | |
| 50 '--verbose', | 49 '--verbose', |
| 51 ]) | 50 ]) |
| 52 else: | 51 else: |
| 53 gtest_args.extend(['--xvfb']) | 52 gtest_args.extend(['--xvfb']) |
| 54 gtest_args.extend(script_args) | 53 gtest_args.extend(script_args) |
| 55 | 54 |
| 56 rc = common.run_runtest(args, gtest_args + filter_tests) | 55 rc = common.run_runtest(args, gtest_args + filter_tests) |
| 57 | 56 |
| 58 with open(tempfile_path) as f: | 57 with open(tempfile_path) as f: |
| 59 results = json.load(f) | 58 results = json.load(f) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 72 else: | 71 else: |
| 73 json.dump(['$name'], args.output) | 72 json.dump(['$name'], args.output) |
| 74 | 73 |
| 75 | 74 |
| 76 if __name__ == '__main__': | 75 if __name__ == '__main__': |
| 77 funcs = { | 76 funcs = { |
| 78 'run': main_run, | 77 'run': main_run, |
| 79 'compile_targets': main_compile_targets, | 78 'compile_targets': main_compile_targets, |
| 80 } | 79 } |
| 81 sys.exit(common.run_script(sys.argv[1:], funcs)) | 80 sys.exit(common.run_script(sys.argv[1:], funcs)) |
| OLD | NEW |