Allow android's logdog_wrapper.py to be used with script tests.

And add it to swarmed cts tests.

Bug: 924545
Change-Id: I882d480de3e9f6f2507e76a9ef83db7601d8404e
Reviewed-on: https://chromium-review.googlesource.com/c/1431114
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625776}

build/android/test_wrapper/logdog_wrapper.py

@@ -34,8 +34,11 @@ LOGDOG_TERMINATION_TIMEOUT = 30
 def CommandParser():
   # Parses the command line arguments being passed in
   parser = argparse.ArgumentParser()
-  parser.add_argument('--target', required=True,
-                      help='The test target to be run.')
+  parser.add_argument(
+      '--target',
+      help='The test target to be run. If not set, any extra '
+      'args passed to this script are assumed to be the '
+      'full test command to run.')
   parser.add_argument('--logdog-bin-cmd', required=True,
                       help='The logdog bin cmd.')
   return parser
@@ -67,9 +70,11 @@ def main():
   args, extra_cmd_args = parser.parse_known_args(sys.argv[1:])
 
   logging.basicConfig(level=logging.INFO)
-  test_cmd = [
-      os.path.join('bin', 'run_%s' % args.target),
-      '-v']
+  if args.target:
+    test_cmd = [os.path.join('bin', 'run_%s' % args.target), '-v']
+    test_cmd += extra_cmd_args
+  else:
+    test_cmd = extra_cmd_args
 
   test_env = dict(os.environ)
   logdog_cmd = []
@@ -102,8 +107,6 @@ def main():
           'LOGDOG_COORDINATOR_HOST': COORDINATOR_HOST,
       })
 
-    test_cmd += extra_cmd_args
-
     logdog_proc = None
     if logdog_cmd:
       logdog_proc = subprocess.Popen(logdog_cmd)

testing/buildbot/gn_isolate_map.pyl

@@ -2758,6 +2758,9 @@
   },
   "webview_cts_tests": {
     "args": [
+      "--logdog-bin-cmd",
+      "../../bin/logdog_butler",
+      "../../third_party/catapult/devil/devil/android/tools/system_app.py",
       "remove",
       "--package",
       "com.android.webview",
@@ -2775,7 +2778,7 @@
       "-v",
     ],
     "label": "//android_webview/test:webview_cts_tests",
-    "script": "//third_party/catapult/devil/devil/android/tools/system_app.py",
+    "script": "//build/android/test_wrapper/logdog_wrapper.py",
     "type": "script",
   },
   "webview_instrumentation_test_apk": {