Don't duplicate gtest-parallel flags in gtest-parallel-wrappers.
Also, move the --timeout=900 flag from the recipe to the mb.py script. That way it is passed as an arg to gtest-parallel and not to the test executable.
BUG=webrtc:7568
NOTRY=True
Review-Url: https://codereview.webrtc.org/2862803002
Cr-Commit-Position: refs/heads/master@{#18015}
diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py
index 9d568ce..a2a593f 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools-webrtc/mb/mb.py
@@ -1096,8 +1096,12 @@
output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs'
gtest_parallel_wrapper = [
'../../tools-webrtc/gtest-parallel-wrapper.py',
- '--gtest_color=no',
'--output_dir=%s' % output_dir,
+ '--gtest_color=no',
+ # We tell gtest-parallel to interrupt the test after 900 seconds,
+ # so it can exit cleanly and report results, instead of being
+ # interrupted by swarming and not reporting anything.
+ '--timeout=900',
]
asan = 'is_asan=true' in vals['gn_args']