Index: build/android/buildbot/bb_run_bot.py |
diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py |
index 56da03c61f7a44fa7fdc304b6bd7ca6af63bbe31..5d403f150dc3ee692af0d65c8be55df1042e9b1b 100755 |
--- a/build/android/buildbot/bb_run_bot.py |
+++ b/build/android/buildbot/bb_run_bot.py |
@@ -45,7 +45,7 @@ def GetEnvironment(host_obj, testing): |
init_env['GOMA_DIR'] = bb_utils.GOMA_DIR |
envsetup_cmd = '. build/android/envsetup.sh' |
if host_obj.target_arch: |
- envsetup_cmd += ' --target_arch=%s' % host_obj.target_arch |
+ envsetup_cmd += ' --target-arch=%s' % host_obj.target_arch |
if testing: |
# Skip envsetup to avoid presubmit dependence on android deps. |
print 'Testing mode - skipping "%s"' % envsetup_cmd |
@@ -112,6 +112,8 @@ def GetBotStepMap(): |
std_test_steps = ['extract_build'] |
std_tests = ['ui', 'unit'] |
flakiness_server = '--upload-to-flakiness-server' |
+ fyi_host_args = ['--experimental'] |
+ fyi_test_args = ['--experimental', flakiness_server] |
Isaac (away)
2013/07/03 09:02:28
too many vars, remove 116
Siva Chandra
2013/07/09 20:47:55
Done.
|
B = BotConfig |
H = (lambda steps, extra_args=None, extra_gyp=None, target_arch=None : |
@@ -135,19 +137,22 @@ def GetBotStepMap(): |
T(std_tests, ['--asan'])), |
B('chromedriver-fyi-tests-dbg', H(std_test_steps), |
T(['chromedriver'], ['--install=ChromiumTestShell'])), |
+ B('fyi-x86-builder-dbg', |
+ H(compile_step + std_host_tests, fyi_host_args, target_arch='x86')), |
B('fyi-builder-dbg', |
- H(std_build_steps + std_host_tests, ['--experimental'])), |
- B('fyi-builder-rel', H(std_build_steps, ['--experimental'])), |
- B('fyi-tests-dbg-ics-gn', H(compile_step, [ '--experimental']), |
- T(std_tests, ['--experimental', flakiness_server])), |
- B('fyi-tests', H(std_test_steps), |
- T(std_tests, ['--experimental', flakiness_server])), |
+ H(std_build_steps + std_host_tests, fyi_host_args)), |
+ B('fyi-builder-rel', H(std_build_steps, fyi_host_args)), |
+ B('fyi-tests-dbg-ics-gn', H(compile_step, fyi_host_args), |
Isaac (away)
2013/07/03 09:02:28
please remove fyi-tests-dbg-ics-gn config.
Siva Chandra
2013/07/09 20:47:55
Done.
|
+ T(std_tests, fyi_test_args)), |
+ B('fyi-tests', H(std_test_steps), T(std_tests, fyi_test_args)), |
B('fyi-component-builder-tests-dbg', |
H(compile_step, extra_gyp='component=shared_library'), |
- T(std_tests, ['--experimental', flakiness_server])), |
+ T(std_tests, fyi_test_args)), |
B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), |
B('perf-tests-rel', H(std_test_steps), |
T([], ['--install=ChromiumTestShell'])), |
+ B('try-x86-builder-dbg', |
Isaac (away)
2013/07/03 09:02:28
Please follow the same pattern as other trybot con
Siva Chandra
2013/07/09 20:47:55
Done.
|
+ H(compile_step + std_host_tests, target_arch='x86')), |
B('webkit-latest-webkit-tests', H(std_test_steps), |
T(['webkit_layout', 'webkit'])), |
B('webkit-latest-contentshell', H(compile_step), T(['webkit_layout'])), |