MB: Run test with gtest-parallel on swarming.

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 038217e072b032b3b2243cd7a38ca70b008f5f21..35bc3578c24a7493fe000a4878c0a331309f9da5 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1077,6 +1077,7 @@ class MetaBuildWrapper(object):
 
     executable = isolate_map[target].get('executable', target)
     executable_suffix = '.exe' if self.platform == 'win32' else ''
+    executable_preffix = '.\\' if self.platform == 'win32' else './'
 
     cmdline = []
     extra_files = []
@@ -1108,57 +1109,45 @@ class MetaBuildWrapper(object):
           'xdisplaycheck',
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
+          '../../third_party/gtest-parallel/gtest-parallel',
       ]
       cmdline = [
         '../../testing/xvfb.py',
         '.',
-        './' + str(executable) + executable_suffix,
-        '--brave-new-test-launcher',
-        '--test-launcher-bot-mode',
+        'python',
+        '../../third_party/gtest-parallel/gtest-parallel',
+        executable_preffix + str(executable) + executable_suffix,
+        '--',
         '--asan=%d' % asan,
         '--msan=%d' % msan,
         '--tsan=%d' % tsan,
       ]
     elif test_type in ('windowed_test_launcher', 'console_test_launcher'):
       extra_files = [
-          '../../testing/test_env.py'
+          '../../testing/test_env.py',
+          '../../third_party/gtest-parallel/gtest-parallel',
       ]
       cmdline = [
           '../../testing/test_env.py',
-          './' + str(executable) + executable_suffix,
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
+          'python',
+          '../../third_party/gtest-parallel/gtest-parallel',
+          executable_preffix + str(executable) + executable_suffix,

[kjellander_webrtc, 2016/11/15 15:13:36]

executable_preffix -> executable_prefix

+          '--',
           '--asan=%d' % asan,
           '--msan=%d' % msan,
           '--tsan=%d' % tsan,
       ]
-    elif test_type == 'gpu_browser_test':
+    elif test_type == 'non_parallel':
       extra_files = [
-          '../../testing/test_env.py'
-      ]
-      gtest_filter = isolate_map[target]['gtest_filter']
-      cmdline = [
           '../../testing/test_env.py',
-          './browser_tests' + executable_suffix,
-          '--test-launcher-bot-mode',
-          '--enable-gpu',
-          '--test-launcher-jobs=1',
-          '--gtest_filter=%s' % gtest_filter,
-      ]
-    elif test_type == 'script':
-      extra_files = [
-          '../../testing/test_env.py'
       ]
       cmdline = [
           '../../testing/test_env.py',
-          '../../' + self.ToSrcRelPath(isolate_map[target]['script'])
-      ]
-    elif test_type in ('raw'):
-      extra_files = []
-      cmdline = [
-          './' + str(target) + executable_suffix,
+          './' + str(executable) + executable_suffix,

[kjellander_webrtc, 2016/11/15 15:13:36]

This line should be:
executable_preffix + str(executable) + executable_suffix,
Followed by a '--', entry on the next line.

Ideally we'd store these 5 lines in a variable and re-use that one for the test
types that have the same code repeated.

+          '--asan=%d' % asan,
+          '--msan=%d' % msan,
+          '--tsan=%d' % tsan,
       ]
-
     else:
       self.WriteFailureAndRaise('No command line for %s found (test type %s).'
                                 % (target, test_type), output_path=None)