commit 2011075a584fad02eed847eca6081f4ae3cd9cbd
author Edward Lemur <ehmaldonado@webrtc.org> Thu Sep 28 16:14:37 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Oct 02 16:57:09 2017 +0000
tree 85c2d9b644d73ec212ff3609c8978c53d0f45e33
parent 208b30936f1d7392f666c0ea19966bdc684b6951

MB: Add support for isolating scripts + isolate low_bandwidth_audio_test.py.

NOTRY=True

Bug: chromium:755660
Change-Id: I92de99cd1e3dd206f6cd366dbfd1c8c211d37cc7
Reviewed-on: https://webrtc-review.googlesource.com/4420
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20089}

tools_webrtc/mb/mb.py

diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py
index 2cd54f2..dcf6a57 100755
--- a/tools_webrtc/mb/mb.py
+++ b/tools_webrtc/mb/mb.py
@@ -833,19 +833,14 @@
           runtime_deps_targets = ['browser_tests.exe.runtime_deps']
         else:
           runtime_deps_targets = ['browser_tests.runtime_deps']
-      elif (isolate_map[target]['type'] == 'script' or
-            isolate_map[target].get('label_type') == 'group'):
-        # For script targets, the build target is usually a group,
-        # for which gn generates the runtime_deps next to the stamp file
-        # for the label, which lives under the obj/ directory, but it may
-        # also be an executable.
-        label = isolate_map[target]['label']
+      elif isolate_map[target]['type'] == 'script':
+        label = isolate_map[target]['label'].split(':')[1]
         runtime_deps_targets = [
-            'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
+            '%s.runtime_deps' % label]
         if self.platform == 'win32':
-          runtime_deps_targets += [ target + '.exe.runtime_deps' ]
+          runtime_deps_targets += [ label + '.exe.runtime_deps' ]
         else:
-          runtime_deps_targets += [ target + '.runtime_deps' ]
+          runtime_deps_targets += [ label + '.runtime_deps' ]
       elif self.platform == 'win32':
         runtime_deps_targets = [target + '.exe.runtime_deps']
       else:
@@ -1047,7 +1042,7 @@
                                 output_path=None)
     if test_type not in ('console_test_launcher', 'windowed_test_launcher',
                          'non_parallel_console_test_launcher',
-                         'additional_compile_target', 'junit_test'):
+                         'additional_compile_target', 'junit_test', 'script'):
       self.WriteFailureAndRaise('No command line for %s found (test type %s).'
                                 % (target, test_type), output_path=None)
 
@@ -1063,6 +1058,8 @@
 
       if test_type != 'junit_test':
         cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}']
+    elif test_type == "script":
+      cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])]
     else:
       extra_files = ['../../testing/test_env.py']