Revert of MB: Run test with gtest-parallel on swarming.

tools/mb/mb.py

 #!/usr/bin/env python
 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """MB - the Meta-Build wrapper around GYP and GN
@@ skipping 1059 matching lines @@
 
     asan = 'is_asan=true' in vals['gn_args']
     msan = 'is_msan=true' in vals['gn_args']
     tsan = 'is_tsan=true' in vals['gn_args']
 
     isolate_map = self.ReadIsolateMap()
     test_type = isolate_map[target]['type']
 
     executable = isolate_map[target].get('executable', target)
     executable_suffix = '.exe' if self.platform == 'win32' else ''
-    executable_prefix = '.\\' if self.platform == 'win32' else './'
 
     cmdline = []
     extra_files = []
-    common_cmdline = [
-      executable_prefix + str(executable) + executable_suffix,
-      '--',
-      '--asan=%d' % asan,
-      '--msan=%d' % msan,
-      '--tsan=%d' % tsan,
-    ]
 
     if test_type == 'nontest':
       self.WriteFailureAndRaise('We should not be isolating %s.' % target,
                                 output_path=None)
 
     if android and test_type != "script":
       logdog_command = [
           '--logdog-bin-cmd', './../../bin/logdog_butler',
           '--project', 'chromium',
           '--service-account-json',
           '/creds/service_accounts/service-account-luci-logdog-publisher.json',
           '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
           '--source', '${ISOLATED_OUTDIR}/logcats',
           '--name', 'unified_logcats',
       ]
       test_cmdline = [
           self.PathJoin('bin', 'run_%s' % target),
           '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
           '--target-devices-file', '${SWARMING_BOT_FILE}',
           '-v'
       ]
       cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
                  + logdog_command + test_cmdline)
     elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [
           'xdisplaycheck',
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
-          '../../third_party/gtest-parallel/gtest-parallel',
       ]
       cmdline = [
         '../../testing/xvfb.py',
         '.',
-        'python',
-        '../../third_party/gtest-parallel/gtest-parallel',
-      ] + common_cmdline
+        './' + str(executable) + executable_suffix,
+        '--brave-new-test-launcher',
+        '--test-launcher-bot-mode',
+        '--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',
-          '../../third_party/gtest-parallel/gtest-parallel',
+          '../../testing/test_env.py'
       ]
       cmdline = [
           '../../testing/test_env.py',
-          'python',
-          '../../third_party/gtest-parallel/gtest-parallel',
-      ] + common_cmdline
-    elif test_type == 'non_parallel_console_test_launcher':
+          './' + str(executable) + executable_suffix,
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=%d' % asan,
+          '--msan=%d' % msan,
+          '--tsan=%d' % tsan,
+      ]
+    elif test_type == 'gpu_browser_test':
       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',
-      ] + common_cmdline
+          '../../' + self.ToSrcRelPath(isolate_map[target]['script'])
+      ]
+    elif test_type in ('raw'):
+      extra_files = []
+      cmdline = [
+          './' + str(target) + executable_suffix,
+      ]
+
     else:
       self.WriteFailureAndRaise('No command line for %s found (test type %s).'
                                 % (target, test_type), output_path=None)
 
     cmdline += isolate_map[target].get('args', [])
 
     return cmdline, extra_files
 
   def ToAbsPath(self, build_path, *comps):
     return self.PathJoin(self.chromium_src_dir,
@@ skipping 399 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:]))