Use logdog butler subcommand to run tests.

tools/mb/mb.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """MB - the Meta-Build wrapper around GYP and GN
 
 MB is a wrapper script for GYP and GN that can be used to generate build files
 for sets of canned configurations and analyze them.
 """
 
 from __future__ import print_function
 
 import argparse
 import ast
 import errno
 import json
+import logging
 import os
 import pipes
 import pprint
 import re
 import shutil
 import sys
 import subprocess
 import tempfile
 import traceback
 import urllib2
@@ skipping 1051 matching lines @@
     executable_suffix = '.exe' if self.platform == 'win32' else ''
 
     cmdline = []
     extra_files = []
 
     if test_type == 'nontest':
       self.WriteFailureAndRaise('We should not be isolating %s.' % target,
                                 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',
-      ]
+      swarming_task_id = os.environ['SWARMING_TASK_ID']

[dnj, 2017/02/18 07:59:25]

So I think this was a bad suggestion on my part. I didn't realize "mb.py" was
generating a command to run elsewhere, not actually running it. I don't think
these values will be available here.

[BigBossZhiling, 2017/02/21 20:24:17]

Done.

+      isolated_outdir = os.environ['ISOLATED_OUTDIR']
+      swarming_bot_file = os.environ['SWARMING_BOT_FILE']
       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)
+          '--logcat-output-file', '%s/logcats' % isolated_outdir,
+          '--target-devices-file', swarming_bot_file,
+          '-v', '--upload-full-logcat', '%s/logcats' % isolated_outdir]
+      project = 'chromium'
+      output = 'logdog,host=services-dot-luci-logdog.appspot.com'
+      prefix = 'android/swarming/logcats/%s' % swarming_task_id
+
+      # Call test_cmdline through logdog butler subcommand.
+      cmdline = [
+          '../../bin/logdog_butler', '-project', project,
+          '-output', output,
+          '-prefix', prefix,
+          'run', '--'] + test_cmdline
     elif use_xvfb and test_type == 'windowed_test_launcher':
       extra_files = [
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
       ]
       cmdline = [
         '../../testing/xvfb.py',
         './' + str(executable) + executable_suffix,
         '--brave-new-test-launcher',
         '--test-launcher-bot-mode',
@@ skipping 453 matching lines @@
   # Then check to see if the arg contains any metacharacters other than
   # double quotes; if it does, quote everything (including the double
   # quotes) for safety.
   if any(a in UNSAFE_FOR_CMD for a in arg):
     arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
   return arg
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))