summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2025-03-06 23:16:13 (GMT)
committerMats Wichmann <mats@linux.com>2025-03-06 23:16:13 (GMT)
commit32a0f691808ad6462f8e7bc674e01c774083481c (patch)
tree1d2b821993ed0b07278ea3c00f1aa91360b04a44
parent86887ebde913d34522402919effcd22940eabf24 (diff)
downloadSCons-32a0f691808ad6462f8e7bc674e01c774083481c.zip
SCons-32a0f691808ad6462f8e7bc674e01c774083481c.tar.gz
SCons-32a0f691808ad6462f8e7bc674e01c774083481c.tar.bz2
Fix typos in CCFLAGS test
tool=[] -> tools=[] Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--CHANGES.txt7
-rw-r--r--test/CC/CCFLAGS.py7
2 files changed, 8 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 699ccfc..d9b2e87 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,9 +12,12 @@ NOTE: Since SCons 4.9.0, Python 3.7.0 or above is required.
RELEASE VERSION/DATE TO BE FILLED IN LATER
- From John Doe:
+ From John Doe:
+ - Whatever John Doe did.
- - Whatever John Doe did.
+ From Mats Wichmann:
+ - Fix typos in CCFLAGS test. Didn't affect the test itself, but
+ didn't correctly apply the DefaultEnvironment speedup.
RELEASE 4.9.0 - Sun, 02 Mar 2025 17:22:20 -0700
diff --git a/test/CC/CCFLAGS.py b/test/CC/CCFLAGS.py
index 7269b9c..343cb4a 100644
--- a/test/CC/CCFLAGS.py
+++ b/test/CC/CCFLAGS.py
@@ -30,7 +30,7 @@ _obj = TestSCons._obj
if sys.platform == 'win32':
import SCons.Tool.MSCommon as msc
-
+
if not msc.msvc_exists():
fooflags = '-DFOO'
barflags = '-DBAR'
@@ -44,7 +44,7 @@ else:
test = TestSCons.TestSCons()
test.write('SConstruct', """
-DefaultEnvironment(tool=[])
+DefaultEnvironment(tools=[])
foo = Environment(CCFLAGS = '%s')
bar = Environment(CCFLAGS = '%s')
foo.Object(target = 'foo%s', source = 'prog.c')
@@ -88,8 +88,7 @@ prog.c: BAZ
""")
test.write('SConstruct', """
-DefaultEnvironment(tool=[])
-
+DefaultEnvironment(tools=[])
bar = Environment(CCFLAGS = '%s')
bar.Object(target = 'foo%s', source = 'prog.c')
bar.Object(target = 'bar%s', source = 'prog.c')