diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py index eb92f239f0..49f681f9dc 100755 --- a/tools-webrtc/mb/mb.py +++ b/tools-webrtc/mb/mb.py @@ -1100,14 +1100,17 @@ class MetaBuildWrapper(object): gtest_parallel = (test_type != 'non_parallel_console_test_launcher' and not memcheck) - gtest_parallel_wrapper = [ - '../../third_party/gtest-parallel/gtest-parallel-wrapper.py' - ] if gtest_parallel: extra_files += [ '../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', ] + sep = '\\' if self.platform == 'win32' else '/' + output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs' + gtest_parallel_wrapper = [ + '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', + '--output_dir=%s' % output_dir, + ] asan = 'is_asan=true' in vals['gn_args'] msan = 'is_msan=true' in vals['gn_args'] diff --git a/tools-webrtc/mb/mb_unittest.py b/tools-webrtc/mb/mb_unittest.py index 3f9a6c9adb..f5c5bc272b 100755 --- a/tools-webrtc/mb/mb_unittest.py +++ b/tools-webrtc/mb/mb_unittest.py @@ -504,6 +504,7 @@ class UnitTest(unittest.TestCase): self.assertEqual(command, [ '../../testing/xvfb.py', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', + '--output_dir=${ISOLATED_OUTDIR}/test_logs', './base_unittests', '--', '--asan=0', @@ -548,6 +549,7 @@ class UnitTest(unittest.TestCase): self.assertEqual(command, [ '../../testing/test_env.py', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', + '--output_dir=${ISOLATED_OUTDIR}\\test_logs', r'.\unittests.exe', '--', '--asan=0', @@ -588,6 +590,7 @@ class UnitTest(unittest.TestCase): self.assertEqual(command, [ '../../testing/test_env.py', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', + '--output_dir=${ISOLATED_OUTDIR}/test_logs', './base_unittests', '--', '--asan=0',