Index: tools-webrtc/mb/mb.py |
diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py |
index eb92f239f0c035586feae16caad3aad4ab4fb7f2..d186216ef0f21f1b53ff152af81b73ea19e79b61 100755 |
--- a/tools-webrtc/mb/mb.py |
+++ b/tools-webrtc/mb/mb.py |
@@ -1100,14 +1100,18 @@ 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 '/' |
kjellander_webrtc
2017/02/07 20:41:39
Just use os.sep instead? https://docs.python.org/2
ehmaldonado_webrtc
2017/02/10 17:50:27
I guess the platform for which the isolate files a
kjellander_webrtc
2017/02/13 05:46:47
Ah, you're right. I thought only to check this fil
|
+ output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs' |
+ gtest_parallel_wrapper = [ |
+ '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', |
+ '--output_dir=%s' % output_dir, |
+ '--timeout=900', # 15 min. |
kjellander_webrtc
2017/02/07 20:41:39
I think we should make this more visible (but keep
ehmaldonado_webrtc
2017/02/10 17:50:27
Acknowledged.
|
+ ] |
asan = 'is_asan=true' in vals['gn_args'] |
msan = 'is_msan=true' in vals['gn_args'] |