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

Unified Diff: build/android/buildbot/bb_run_bot.py

Issue 18595002: [Android] Remove few redundent pieces missed in CL 17114007 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..72bda44422bb8eb37cfa0b0d02b259d184d5191b 100755
--- a/build/android/buildbot/bb_run_bot.py
+++ b/build/android/buildbot/bb_run_bot.py
@@ -78,7 +78,7 @@ def GetEnvironment(host_obj, testing):
return env
-def GetCommands(options, bot_config, host_step_script, device_step_script):
+def GetCommands(options, bot_config):
"""Get a formatted list of commands.
Args:
@@ -90,13 +90,13 @@ def GetCommands(options, bot_config, host_step_script, device_step_script):
list of Command objects.
"""
property_args = bb_utils.EncodeProperties(options)
- commands = [[host_step_script,
+ commands = [[bot_config.host_obj.script,
'--steps=%s' % ','.join(bot_config.host_obj.host_steps)] +
property_args + (bot_config.host_obj.extra_args or [])]
test_obj = bot_config.test_obj
if test_obj:
- run_test_cmd = [device_step_script, '--reboot'] + property_args
+ run_test_cmd = [test_obj.script, '--reboot'] + property_args
for test in test_obj.tests:
run_test_cmd.extend(['-f', test])
if test_obj.extra_args:
@@ -226,10 +226,7 @@ def main(argv):
print 'Using config:', bot_config
- commands = GetCommands(
- options, bot_config,
- 'build/android/buildbot/bb_host_steps.py',
- 'build/android/buildbot/bb_device_steps.py')
+ commands = GetCommands(options, bot_config)
for command in commands:
print 'Will run: ', bb_utils.CommandToString(command)
print
« 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