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

Pass isolate output dir to gtest-parallel-wrapper.py

Browse Source 
This makes it possible to archive all test execution logs on swarming jobs.

R=kjellander@webrtc.org
BUG=webrtc:7086
NOTRY=True

Review-Url: https://codereview.webrtc.org/2686563002
Cr-Commit-Position: refs/heads/master@{#16574}
This commit is contained in:
ehmaldonado
2017-02-13 03:58:13 -08:00
committed by Commit bot
parent 1771a3ca0f
commit 5583384048
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools-webrtc/mb/mb.py
View File

@ -1100,14 +1100,17 @@ class MetaBuildWrapper(object):
gtest_parallel = (test_type != 'non_parallel_console_test_launcher' and gtest_parallel = (test_type != 'non_parallel_console_test_launcher' and
not memcheck) not memcheck)
gtest_parallel_wrapper = [
'../../third_party/gtest-parallel/gtest-parallel-wrapper.py'
]
if gtest_parallel: if gtest_parallel:
extra_files += [ extra_files += [
'../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel',
'../../third_party/gtest-parallel/gtest-parallel-wrapper.py', '../../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'] asan = 'is_asan=true' in vals['gn_args']
msan = 'is_msan=true' in vals['gn_args'] msan = 'is_msan=true' in vals['gn_args']

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

@ -504,6 +504,7 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/xvfb.py', '../../testing/xvfb.py',
'../../third_party/gtest-parallel/gtest-parallel-wrapper.py', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'./base_unittests', './base_unittests',
'--', '--',
'--asan=0', '--asan=0',
@ -548,6 +549,7 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../third_party/gtest-parallel/gtest-parallel-wrapper.py', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}\\test_logs',
r'.\unittests.exe', r'.\unittests.exe',
'--', '--',
'--asan=0', '--asan=0',
@ -588,6 +590,7 @@ class UnitTest(unittest.TestCase):
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../third_party/gtest-parallel/gtest-parallel-wrapper.py', '../../third_party/gtest-parallel/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'./base_unittests', './base_unittests',
'--', '--',
'--asan=0', '--asan=0',