Chromium Code Reviews| Index: tools/mb/mb.py |
| diff --git a/tools/mb/mb.py b/tools/mb/mb.py |
| index edbb434d27bfb36a9f3f4d1e8c0ab59231e909a3..4741ea29e0130b5a7e0a3227ac30868528a730a2 100755 |
| --- a/tools/mb/mb.py |
| +++ b/tools/mb/mb.py |
| @@ -15,6 +15,7 @@ import argparse |
| import ast |
| import errno |
| import json |
| +import logging |
|
dnj
2017/02/22 21:46:45
It doesn't look like you're using this.
BigBossZhiling
2017/02/22 23:49:52
Done.
|
| import os |
| import pipes |
| import pprint |
| @@ -1086,23 +1087,21 @@ 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,host=services-dot-luci-logdog.appspot.com' |
|
dnj
2017/02/22 21:46:45
Note that this notation is changing to:
-coordinat
BigBossZhiling
2017/02/22 23:49:52
Done. It is "services" instead of just services?
|
| + prefix = 'android/swarming/logcats/${SWARMING_TASK_ID}' |
| + |
| + # Call test_cmdline through logdog butler subcommand. |
| + cmdline = [ |
| + '../../bin/logdog_butler', '-project', project, |
| + '-output', output, |
| + '-prefix', prefix, |
| + 'run', '--'] + test_cmdline |
|
dnj
2017/02/22 21:46:45
Same comment from last time. You're not connecting
BigBossZhiling
2017/02/22 23:49:52
Done.
|
| elif use_xvfb and test_type == 'windowed_test_launcher': |
| extra_files = [ |
| '../../testing/test_env.py', |