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

Unified Diff: tools/mb/mb.py

Issue 2695963003: Use logdog butler subcommand to run tests. (Closed)
Patch Set: fixes Created 3 years, 10 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 | « build/android/test_wrapper/logdog_wrapper.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index edbb434d27bfb36a9f3f4d1e8c0ab59231e909a3..77b927f434c5d9a82f98939a45675c8ad01aa0bf 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1086,23 +1086,24 @@ class MetaBuildWrapper(object):
output_path=None)
if android and test_type != "script":
- logdog_command = [
- '--logdog-bin-cmd', './../../bin/logdog_butler',
- '--project', 'chromium',
- '--service-account-json',
- '/creds/service_accounts/service-account-luci-logdog-publisher.json',
- '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
- '--source', '${ISOLATED_OUTDIR}/logcats',
- '--name', 'unified_logcats',
- ]
test_cmdline = [
self.PathJoin('bin', 'run_%s' % target),
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'--target-devices-file', '${SWARMING_BOT_FILE}',
- '-v'
- ]
- cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
- + logdog_command + test_cmdline)
+ '-v', '--upload-full-logcat', '${ISOLATED_OUTDIR}/logcats']
+ project = 'chromium'
+ output = 'logdog,service="services"'
+ coordinator_host = 'luci-logdog.appspot.com'
+ streamserver_uri = 'unix:/tmp/butler.sock'
dnj 2017/02/22 23:57:02 This is a really generic name for this. You should
BigBossZhiling 2017/02/27 19:43:17 Done.
+ prefix = 'android/swarming/logcats/${SWARMING_TASK_ID}'
+
+ # Call test_cmdline through logdog butler subcommand.
+ cmdline = [
+ '../../bin/logdog_butler', '-project', project,
+ '-output', output,
+ '-prefix', prefix,
+ '-coordinator-host', coordinator_host,
+ 'run', '-streamserver-uri', streamserver_uri, '--'] + test_cmdline
dnj 2017/02/22 23:57:02 Break these like you did the above arguments.
BigBossZhiling 2017/02/27 19:43:17 Done.
elif use_xvfb and test_type == 'windowed_test_launcher':
extra_files = [
'../../testing/test_env.py',
« no previous file with comments | « build/android/test_wrapper/logdog_wrapper.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698