mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix windows bot command line issue.

Browse source 
When wrapping test_env.py command on windows bot, there is an error because the python command is missing.
Adding vpython in the command like it is done on chromium mb.py script fixes the problem.

Bug: b/197492097
Change-Id: I91dbad31549fb29058424ca3b2fb8539c3e8010e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/238760
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Christoffer Jansson <jansson@google.com>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#35407}
This commit is contained in:
Jeremy Leconte 2021-11-23 14:32:09 +01:00 committed by WebRTC LUCI CQ
parent 45e15e3343
commit aad4ba102b
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools_webrtc/mb/mb.py
View file

@ -907,25 +907,28 @@ class MetaBuildWrapper(object):
'../../.vpython',
'../../testing/test_env.py',
]
vpython_exe = 'vpython'
must_retry = False
if test_type == 'script':
cmdline += ['../../' +
self.ToSrcRelPath(isolate_map[target]['script'])]
elif is_android:
cmdline += ['../../build/android/test_wrapper/logdog_wrapper.py',
cmdline += [vpython_exe,
'../../build/android/test_wrapper/logdog_wrapper.py',
'--target', target,
'--logdog-bin-cmd', '../../bin/logdog_butler',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'--store-tombstones']
else:
if test_type == 'raw':
cmdline.append('../../tools_webrtc/flags_compatibility.py')
cmdline += [vpython_exe,
'../../tools_webrtc/flags_compatibility.py']
extra_files.append('../../tools_webrtc/flags_compatibility.py')
if isolate_map[target].get('use_webcam', False):
cmdline.append(
'../../tools_webrtc/ensure_webcam_is_running.py')
cmdline += [vpython_exe,
'../../tools_webrtc/ensure_webcam_is_running.py']
extra_files.append(
'../../tools_webrtc/ensure_webcam_is_running.py')
@ -934,10 +937,10 @@ class MetaBuildWrapper(object):
xvfb = use_x11 and test_type == 'windowed_test_launcher'
if xvfb:
cmdline.append('../../testing/xvfb.py')
cmdline += [vpython_exe, '../../testing/xvfb.py']
extra_files.append('../../testing/xvfb.py')
else:
cmdline.append('../../testing/test_env.py')
cmdline += [vpython_exe, '../../testing/test_env.py']
if test_type != 'raw':
extra_files += [

11
tools_webrtc/mb/mb_unittest.py
View file

@ -333,6 +333,7 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, ['../../.vpython', '../../testing/test_env.py',
'base_unittests'])
self.assertEqual(command, [
'vpython',
'../../build/android/test_wrapper/logdog_wrapper.py',
'--target', 'base_unittests',
'--logdog-bin-cmd', '../../bin/logdog_butler',
@ -367,6 +368,7 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, ['../../.vpython', '../../testing/test_env.py',
'base_unittests'])
self.assertEqual(command, [
'vpython',
'../../build/android/test_wrapper/logdog_wrapper.py',
'--target', 'base_unittests',
'--logdog-bin-cmd', '../../bin/logdog_butler',
@ -408,6 +410,7 @@ class UnitTest(unittest.TestCase):
'base_unittests',
])
self.assertEqual(command, [
'vpython',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
@ -489,7 +492,9 @@ class UnitTest(unittest.TestCase):
'base_unittests',
])
self.assertEqual(command, [
'vpython',
'../../tools_webrtc/flags_compatibility.py',
'vpython',
'../../testing/test_env.py',
'./base_unittests',
'--asan=0',
@ -531,6 +536,7 @@ class UnitTest(unittest.TestCase):
'base_unittests',
])
self.assertEqual(command, [
'vpython',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
@ -582,6 +588,7 @@ class UnitTest(unittest.TestCase):
'some_resource_file',
])
self.assertEqual(command, [
'vpython',
'../../testing/xvfb.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
@ -634,6 +641,7 @@ class UnitTest(unittest.TestCase):
'unittests.exe',
])
self.assertEqual(command, [
'vpython',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}\\test_logs',
@ -681,6 +689,7 @@ class UnitTest(unittest.TestCase):
'base_unittests',
])
self.assertEqual(command, [
'vpython',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
@ -732,7 +741,9 @@ class UnitTest(unittest.TestCase):
'some_resource_file',
])
self.assertEqual(command, [
'vpython',
'../../tools_webrtc/ensure_webcam_is_running.py',
'vpython',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',