Logdog for logcats

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index c21e2f10879f11ee85bc4d03fac9fbd5cfc35a13..472f0635dee9edab15b6eda49b580f3377180a5f 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1010,11 +1010,26 @@ class MetaBuildWrapper(object):
     extra_files = []
 
     if android and test_type != "script":
-      cmdline = [
+      logdog_command = [
+          './../../bin/logdog_butler',
+          '-project', 'chromium',
+          '-output', 'logdog,host=luci-logdog-dev.appspot.com',
+          #'-service-account-json',

[ghost stip (do not use), 2016/07/27 01:14:18]

don't commit commented-out code

[nicholaslin, 2016/07/27 19:08:06]

This will be uncommented before deployment. Hopefully with logdog switched to
luci-logdog instead of luci-logdog-dev. Otherwise will need authentication for
the dev account on swarming bots.

+          #'/creds/service_accounts/service-account-luci-logdog-publisher.json'
+          '-prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
+          'stream', '-source', '${ISOLATED_OUTDIR}/logcats',
+          '-stream', '-name=unified_logcats'
+      ]
+      test_cmdline = [
           self.PathJoin('bin', 'run_%s' % target_name),
-          '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+          '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
           '--target-devices-file', '${SWARMING_BOT_FILE}',
-          '-v',
+          '-v'
+      ]
+      cmdline = [
+          './../../build/android/test_wrapper/test_runner_wrapper.py',
+          '--test-runner-command', ' '.join(test_cmdline),

[ghost stip (do not use), 2016/07/27 01:14:18]

this should just be the arguments of the program. joining and splitting by space
is dangerous

[nicholaslin, 2016/07/27 19:08:06]

Done.

+          '--logdog-command', ' '.join(logdog_command),
       ]
     elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [