Logdog for logcats

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.
 """
@@ skipping 992 matching lines @@
     target_name = self.GNTargetName(target)
     test_type = gn_isolate_map[target_name]['type']
 
     executable = gn_isolate_map[target_name].get('executable', target_name)
     executable_suffix = '.exe' if self.platform == 'win32' else ''
 
     cmdline = []
     extra_files = []
 
     if android and test_type != "script":
+      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-file', '${ISOLATED_OUTDIR}/logcats',
+          '--target-devices-file', '${SWARMING_BOT_FILE}',
+          '-v'
+      ]
       cmdline = [
-          self.PathJoin('bin', 'run_%s' % target_name),
-          '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
-          '--target-devices-file', '${SWARMING_BOT_FILE}',
-          '-v',
+          './../../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 = [
           'xdisplaycheck',
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
       ]
       cmdline = [
         '../../testing/xvfb.py',
         '.',
@@ skipping 473 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:]))