admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use windows path in mb.py

Browse Source 
Swarming Windows bots translate the path to Windows path.
https://chromium-swarm.appspot.com/task?id=5a5a3b202f930010

Bug: webrtc:13475
Change-Id: I21589e67057174651d467f4f78e33bdd21a4e1c5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259302
Reviewed-by: Christoffer Jansson <jansson@google.com>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36571}
This commit is contained in:
Jeremy Leconte 2022-04-19 14:03:35 +02:00 committed by WebRTC LUCI CQ
parent 0d510529e7
commit e288161529
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools_webrtc/mb/mb.py
View File

@ -117,8 +117,7 @@ class WebRTCMetaBuildWrapper(mb.MetaBuildWrapper):
'../../third_party/gtest-parallel/gtest_parallel.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
]
sep = '\\' if self.platform == 'win32' else '/'
output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs'
output_dir = '${ISOLATED_OUTDIR}/test_logs'
timeout = isolate_map[target].get('timeout', 900)
cmdline += [
'../../tools_webrtc/gtest-parallel-wrapper.py',

3
tools_webrtc/mb/mb_unittest.py
View File

@ -59,6 +59,7 @@ class FakeMBW(mb.WebRTCMetaBuildWrapper):
self.rmdirs = []
def ExpandUser(self, path):
# pylint: disable=no-self-use
return '$HOME/%s' % path
def Exists(self, path):
@ -715,7 +716,7 @@ class UnitTest(unittest.TestCase):
'vpython3',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}\\test_logs',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'--retry_failed=3',