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}
This commit is contained in:
ehmaldonado
2017-05-04 06:18:26 -07:00
committed by Commit bot
parent 02739d9149
commit 76e60e928f
3 changed files with 75 additions and 59 deletions

View File

@ -1096,8 +1096,12 @@ class MetaBuildWrapper(object):
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']