From e288161529a79d362d55458c1f4c23013736035a Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Tue, 19 Apr 2022 14:03:35 +0200 Subject: [PATCH] Don't use windows path in mb.py 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 Reviewed-by: Christoffer Jansson Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#36571} --- tools_webrtc/mb/mb.py | 3 +-- tools_webrtc/mb/mb_unittest.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index ae35cf7482..915a5b83ed 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -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', diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index 054b49249e..4f27cc38a8 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -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',