zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't duplicate gtest-parallel flags in gtest-parallel-wrappers.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
tools-webrtc/mb/mb_unittest.py
View File

@ -448,8 +448,9 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [
'../../testing/test_env.py',
'../../tools-webrtc/gtest-parallel-wrapper.py',
'--gtest_color=no',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'./base_unittests',
'--workers=1',
'--',
@ -494,8 +495,9 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [
'../../testing/xvfb.py',
'../../tools-webrtc/gtest-parallel-wrapper.py',
'--gtest_color=no',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'./base_unittests',
'--',
'--asan=0',
@ -540,8 +542,9 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [
'../../testing/test_env.py',
'../../tools-webrtc/gtest-parallel-wrapper.py',
'--gtest_color=no',
'--output_dir=${ISOLATED_OUTDIR}\\test_logs',
'--gtest_color=no',
'--timeout=900',
r'.\unittests.exe',
'--',
'--asan=0',
@ -582,8 +585,9 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [
'../../testing/test_env.py',
'../../tools-webrtc/gtest-parallel-wrapper.py',
'--gtest_color=no',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'./base_unittests',
'--',
'--asan=0',