| Index: build/android/buildbot/bb_device_steps.py
|
| diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
|
| index 0743b535bf39b3fe5de715e7395cfc7bba2b5220..e4062ba5193222d5cbc5fa8c322bd14a140fc63d 100755
|
| --- a/build/android/buildbot/bb_device_steps.py
|
| +++ b/build/android/buildbot/bb_device_steps.py
|
| @@ -121,7 +121,7 @@ def RebootDevices():
|
| print 'Reboots complete.'
|
|
|
|
|
| -def RunTestSuites(options, suites):
|
| +def RunTestSuites(options, all_suites):
|
| """Manages an invocation of run_tests.py.
|
|
|
| Args:
|
| @@ -133,9 +133,13 @@ def RunTestSuites(options, suites):
|
| args.append('--release')
|
| if options.asan:
|
| args.append('--tool=asan')
|
| - for suite in suites:
|
| - buildbot_report.PrintNamedStep(suite)
|
| - RunCmd(['build/android/run_tests.py', '-s', suite] + args)
|
| + for is_exe_suite, suites in all_suites.iteritems():
|
| + for suite in suites:
|
| + buildbot_report.PrintNamedStep(suite)
|
| + cmd = ['build/android/run_tests.py', '-s', suite] + args
|
| + if is_exe_suite:
|
| + cmd.append('--exe')
|
| + RunCmd(cmd)
|
|
|
| def RunBrowserTestSuite(options):
|
| """Manages an invocation of run_browser_tests.py.
|
| @@ -273,7 +277,7 @@ def MainTestWrapper(options):
|
| for test in INSTRUMENTATION_TESTS.itervalues():
|
| RunInstrumentationSuite(options, test)
|
| if 'webkit' in options.test_filter:
|
| - RunTestSuites(options, ['webkit_unit_tests', 'TestWebKitAPI'])
|
| + RunTestSuites(options, {False: ['webkit_unit_tests', 'TestWebKitAPI']})
|
| RunWebkitLint(options.target)
|
| if 'webkit_layout' in options.test_filter:
|
| RunWebkitLayoutTests(options)
|
|
|