summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2021-11-09 16:12:58 (GMT)
committerMats Wichmann <mats@linux.com>2021-11-09 16:12:58 (GMT)
commit7f62e55c08e1782f0d9120e1752d9802068b53bd (patch)
tree533f1747feafbeff48373b45d97289eb55de6f7f
parent5c17d2424c1a17cff72bfdd721ad0b72aeb05b56 (diff)
downloadSCons-7f62e55c08e1782f0d9120e1752d9802068b53bd.zip
SCons-7f62e55c08e1782f0d9120e1752d9802068b53bd.tar.gz
SCons-7f62e55c08e1782f0d9120e1752d9802068b53bd.tar.bz2
Fix gcc-version test for Windows
A constructed string containing the Python path wasn't listed as a raw string, which led to a unicode error, because the path string contained a \Users which was misinterpreted as a Unicode escape. Also had left a debug print in a script. Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--test/CC/gcc-non-utf8-fixture/gcc-non-utf8.py2
-rw-r--r--test/CC/gcc-version.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/test/CC/gcc-non-utf8-fixture/gcc-non-utf8.py b/test/CC/gcc-non-utf8-fixture/gcc-non-utf8.py
index daa5fe2..292e5cb 100644
--- a/test/CC/gcc-non-utf8-fixture/gcc-non-utf8.py
+++ b/test/CC/gcc-non-utf8-fixture/gcc-non-utf8.py
@@ -1,7 +1,5 @@
import sys
-print(f"In {sys.argv[0]}")
-
if __name__ == '__main__':
if '--version' in sys.argv:
with open("data", "rb") as f:
diff --git a/test/CC/gcc-version.py b/test/CC/gcc-version.py
index 13defec..8c72399 100644
--- a/test/CC/gcc-version.py
+++ b/test/CC/gcc-version.py
@@ -44,7 +44,7 @@ test.write(
import sys
DefaultEnvironment(tools=[])
-env = Environment(tools=[], CC="%(_python_)s gcc-non-utf8.py")
+env = Environment(tools=[], CC=r"%(_python_)s gcc-non-utf8.py")
try:
env.Tool('gcc')
except UnicodeDecodeError: