summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2024-05-26 18:11:31 (GMT)
committerMats Wichmann <mats@linux.com>2024-05-26 18:11:31 (GMT)
commit44bd8b4da325ffb04ce806586b9639366050f1d7 (patch)
tree912fd987266e05c719838cf9570c25324efd6c0a /testing
parent9f7537192149db186d5bc2c9c2891f67cb71d307 (diff)
downloadSCons-44bd8b4da325ffb04ce806586b9639366050f1d7.zip
SCons-44bd8b4da325ffb04ce806586b9639366050f1d7.tar.gz
SCons-44bd8b4da325ffb04ce806586b9639366050f1d7.tar.bz2
Fix two scons-time tests on GH Windows runner
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'testing')
-rw-r--r--testing/framework/TestSCons_time.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/testing/framework/TestSCons_time.py b/testing/framework/TestSCons_time.py
index d2f061a..6ee4b10 100644
--- a/testing/framework/TestSCons_time.py
+++ b/testing/framework/TestSCons_time.py
@@ -40,6 +40,7 @@ import sys
from TestCommon import *
from TestCommon import __all__
+from TestCmd import IS_WINDOWS
# some of the scons_time tests may need regex-based matching:
from TestSCons import search_re, search_re_in_list
@@ -236,7 +237,11 @@ class TestSCons_time(TestCommon):
except AttributeError:
pass
else:
- tempdir = realpath(tempdir)
+ # Don't realpath on Windows, tempdir could contain 8+3 path
+ # E.g. username on GitHub runner is "runneradmin" -> "RUNNER~1"
+ # We don't want to convert that back!
+ if not IS_WINDOWS:
+ tempdir = realpath(tempdir)
args = (tempdir, 'scons-time-',) + args
x = os.path.join(*args)