| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 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 collections | 6 import collections |
| 7 import glob | 7 import glob |
| 8 import json | 8 import json |
| 9 import multiprocessing | 9 import multiprocessing |
| 10 import optparse | 10 import optparse |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 '--no-show-results', | 229 '--no-show-results', |
| 230 '--no-new-test-results', | 230 '--no-new-test-results', |
| 231 '--full-results-html', | 231 '--full-results-html', |
| 232 '--clobber-old-results', | 232 '--clobber-old-results', |
| 233 '--exit-after-n-failures', '5000', | 233 '--exit-after-n-failures', '5000', |
| 234 '--exit-after-n-crashes-or-timeouts', '100', | 234 '--exit-after-n-crashes-or-timeouts', '100', |
| 235 '--debug-rwt-logging', | 235 '--debug-rwt-logging', |
| 236 '--results-directory', '..layout-test-results', | 236 '--results-directory', '..layout-test-results', |
| 237 '--target', options.target, | 237 '--target', options.target, |
| 238 '--builder-name', options.build_properties.get('buildername', ''), | 238 '--builder-name', options.build_properties.get('buildername', ''), |
| 239 '--build-number', options.build_properties.get('buildnumber', ''), | 239 '--build-number', str(options.build_properties.get('buildnumber', '')), |
| 240 '--master-name', options.build_properties.get('mastername', ''), | 240 '--master-name', options.build_properties.get('mastername', ''), |
| 241 '--build-name', options.build_properties.get('buildername', ''), | 241 '--build-name', options.build_properties.get('buildername', ''), |
| 242 '--platform=chromium-android'] | 242 '--platform=chromium-android'] |
| 243 | 243 |
| 244 for flag in 'test_results_server', 'driver_name', 'additional_drt_flag': | 244 for flag in 'test_results_server', 'driver_name', 'additional_drt_flag': |
| 245 if flag in options.factory_properties: | 245 if flag in options.factory_properties: |
| 246 cmd_args.extend(['--%s' % flag.replace('_', '-'), | 246 cmd_args.extend(['--%s' % flag.replace('_', '-'), |
| 247 options.factory_properties.get(flag)]) | 247 options.factory_properties.get(flag)]) |
| 248 | 248 |
| 249 for f in options.factory_properties.get('additional_expectations', []): | 249 for f in options.factory_properties.get('additional_expectations', []): |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 'slave', 'android')) | 380 'slave', 'android')) |
| 381 if os.path.exists(build_internal_android): | 381 if os.path.exists(build_internal_android): |
| 382 android_paths.insert(0, build_internal_android) | 382 android_paths.insert(0, build_internal_android) |
| 383 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) | 383 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) |
| 384 | 384 |
| 385 MainTestWrapper(options) | 385 MainTestWrapper(options) |
| 386 | 386 |
| 387 | 387 |
| 388 if __name__ == '__main__': | 388 if __name__ == '__main__': |
| 389 sys.exit(main(sys.argv)) | 389 sys.exit(main(sys.argv)) |
| OLD | NEW |