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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 | 233 |
234 for flag in 'test_results_server', 'driver_name', 'additional_drt_flag': | 234 for flag in 'test_results_server', 'driver_name', 'additional_drt_flag': |
235 if flag in options.factory_properties: | 235 if flag in options.factory_properties: |
236 cmd_args.extend(['--%s' % flag.replace('_', '-'), | 236 cmd_args.extend(['--%s' % flag.replace('_', '-'), |
237 options.factory_properties.get(flag)]) | 237 options.factory_properties.get(flag)]) |
238 | 238 |
239 for f in options.factory_properties.get('additional_expectations_files', []): | 239 for f in options.factory_properties.get('additional_expectations_files', []): |
240 cmd_args.extend( | 240 cmd_args.extend( |
241 ['--additional-expectations=%s' % os.path.join(CHROME_SRC, *f)]) | 241 ['--additional-expectations=%s' % os.path.join(CHROME_SRC, *f)]) |
242 | 242 |
243 RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args) | 243 RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args, |
| 244 flunk_on_failure=False) |
244 | 245 |
245 | 246 |
246 def MainTestWrapper(options): | 247 def MainTestWrapper(options): |
247 # Restart adb to work around bugs, sleep to wait for usb discovery. | 248 # Restart adb to work around bugs, sleep to wait for usb discovery. |
248 RunCmd(['adb', 'kill-server']) | 249 RunCmd(['adb', 'kill-server']) |
249 RunCmd(['adb', 'start-server']) | 250 RunCmd(['adb', 'start-server']) |
250 RunCmd(['sleep', '1']) | 251 RunCmd(['sleep', '1']) |
251 | 252 |
252 # Spawn logcat monitor | 253 # Spawn logcat monitor |
253 logcat_dir = os.path.join(CHROME_SRC, 'out/logcat') | 254 logcat_dir = os.path.join(CHROME_SRC, 'out/logcat') |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 'slave', 'android')) | 354 'slave', 'android')) |
354 if os.path.exists(build_internal_android): | 355 if os.path.exists(build_internal_android): |
355 android_paths.insert(0, build_internal_android) | 356 android_paths.insert(0, build_internal_android) |
356 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) | 357 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) |
357 | 358 |
358 MainTestWrapper(options) | 359 MainTestWrapper(options) |
359 | 360 |
360 | 361 |
361 if __name__ == '__main__': | 362 if __name__ == '__main__': |
362 sys.exit(main(sys.argv)) | 363 sys.exit(main(sys.argv)) |
OLD | NEW |