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":
-      cmdline = [
+      logdog_command = [
+          '--logdog-bin-cmd', './../../bin/logdog_butler',

[ghost stip (do not use), 2016/07/29 21:56:40]

CHROMIUM_SRC_DIR/bin/ ? see line 31

[nicholaslin, 2016/07/29 23:54:06]

Tried that before. That's for the buildbot slave not the swarming slave.

+          '--project', 'chromium',
+          '--logdog-server', 'luci-logdog.appspot.com',

[dnj, 2016/07/29 22:35:34]

Specifying this twice? Either use the default or remove the default value above.

[nicholaslin, 2016/07/29 23:54:06]

Removed it here.

+          '--service-account-json',
+          '/creds/service_accounts/service-account-luci-logdog-publisher.json',

[dnj, 2016/07/29 22:35:34]

Are we comfortable hardcoding this in "chromium/src"? This will also not work on
GCE, but that probably doesn't matter.

[dnj, 2016/07/30 15:47:48]

Ping on this. We're baking Infra credential paths in to "chromium/src" here. I
don't know if this is something that we want so far away from actual infra-homed
code.

Let's discuss alternatives, specifically, there is an option for me to actually
bake this into LogDog Butler itself so that neither the JSON path nor the "host"
is needed. I'll put together a CL for this, since it's something I've been
meaning to do for a while.

[nicholaslin, 2016/08/02 22:05:13]

Noted. Will think about alternatives.

+          '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
+          '--source', '${ISOLATED_OUTDIR}/logcats',
+          '--name', 'unified_logcats',
+      ]
+      test_cmdline = [
           self.PathJoin('bin', 'run_%s' % target_name),
-          '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+          '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',

[ghost stip (do not use), 2016/07/29 21:56:40]

unified_logcats?

[nicholaslin, 2016/07/29 23:54:06]

Done.

Do we want it to be named unified logcats? The location doesn't really matter
for logdog since name overwrites the file location.

           '--target-devices-file', '${SWARMING_BOT_FILE}',
-          '-v',
+          '-v'
       ]
+      cmdline = (['./../../build/android/logdog_wrapper/logdog_test_wrapper.py']

[ghost stip (do not use), 2016/07/29 21:56:40]

os.path.join(CHROMIUM_SRC_DIR, 'build', 'android') etc

[nicholaslin, 2016/07/29 23:54:06]

see above.

+                 + logdog_command + test_cmdline)
     elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [
           'xdisplaycheck',
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
       ]
       cmdline = [
         '../../testing/xvfb.py',
         '.',
         './' + str(executable) + executable_suffix,
@@ skipping 472 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:]))