Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(463)

Side by Side Diff: build/android/buildbot/bb_device_steps.py

Issue 12709003: Failing layout tests on Android shouldn't fail the whole bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698