minimize tool initialization in tests

Author: bdbaddog

test/CPPDEFINES/basic.py

@@ -32,6 +32,7 @@
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 test_list = [
     'xyz',
     ['x', 'y', 'z'],
@@ -47,7 +48,7 @@ def generator(target, source, env, for_signature):
     return 'TARGET_AND_SOURCE_ARE_MISSING'
 
 for i in test_list:
-    env = Environment(
+    env = Environment(tools=['cc'],
         CPPDEFPREFIX='-D',
         CPPDEFSUFFIX='',
         INTEGER=0,
@@ -65,7 +66,7 @@ def generator(target, source, env, for_signature):
     )
 
 for i in test_list:
-    env = Environment(
+    env = Environment(tools=['cc'],
         CPPDEFPREFIX='|',
         CPPDEFSUFFIX='|',
         INTEGER=1,

test/CPPDEFINES/fixture/SConstruct-Append

@@ -8,46 +8,46 @@ DefaultEnvironment(tools=[])
 
 # Special cases:
 # https://github.com/SCons/scons/issues/1738
-env_1738_2 = Environment(CPPDEFPREFIX='-D')
+env_1738_2 = Environment(tools=['gcc'],CPPDEFPREFIX='-D')
 env_1738_2['CPPDEFINES'] = ['FOO']
 env_1738_2.Append(CPPDEFINES={'value': '1'})
 print(env_1738_2.subst('$_CPPDEFFLAGS'))
 # env_1738_2.Object('test_1738_2', 'main.c')
 
 # https://github.com/SCons/scons/issues/2300
-env_2300_1 = Environment(CPPDEFINES='foo', CPPDEFPREFIX='-D')
+env_2300_1 = Environment(tools=['gcc'],CPPDEFINES='foo', CPPDEFPREFIX='-D')
 env_2300_1.Append(CPPDEFINES='bar')
 print(env_2300_1.subst('$_CPPDEFFLAGS'))
 
-env_2300_2 = Environment(CPPDEFINES=['foo'], CPPDEFPREFIX='-D')  # note the list
+env_2300_2 = Environment(tools=['gcc'],CPPDEFINES=['foo'], CPPDEFPREFIX='-D')  # note the list
 env_2300_2.Append(CPPDEFINES='bar')
 print(env_2300_2.subst('$_CPPDEFFLAGS'))
 
 # An initial space-separated string will be split, but not a string in a list.
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = "foo bar"
 env_multi.Append(CPPDEFINES="baz")
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = ["foo bar"]
 env_multi.Append(CPPDEFINES="baz")
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = "foo"
 env_multi.Append(CPPDEFINES=["bar baz"])
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = "foo"
 env_multi.Append(CPPDEFINES="bar baz")
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
 # Check that AppendUnique(..., delete_existing=True) works as expected.
 # Each addition is in different but matching form, and different order
 # so we expect a reordered list, but with the same macro defines.
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D')
 env_multi.Append(CPPDEFINES=["Macro1=Value1", ("Macro2", "Value2"), {"Macro3": "Value3"}, "Macro4"])
 try:
     env_multi.AppendUnique(CPPDEFINES="Macro2=Value2", delete_existing=True)
@@ -60,9 +60,9 @@ else:
     print(env_multi.subst('$_CPPDEFFLAGS'))
 
 # A lone tuple handled differently than a lone list.
-env_multi = Environment(CPPDEFPREFIX='-D', CPPDEFINES=("Macro1", "Value1"))
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D', CPPDEFINES=("Macro1", "Value1"))
 print(env_multi.subst('$_CPPDEFFLAGS'))
-env_multi = Environment(CPPDEFPREFIX='-D', CPPDEFINES=["Macro1", "Value1"])
+env_multi = Environment(tools=['gcc'],CPPDEFPREFIX='-D', CPPDEFINES=["Macro1", "Value1"])
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
 # https://github.com/SCons/scons/issues/1152
@@ -114,15 +114,15 @@ for (t1, c1) in cases:
         orig = f"{c1!r}" if isinstance(c1, str) else c1
         app = f"{c2!r}" if isinstance(c2, str) else c2
         print(f"   orig = {orig}, append = {app}")
-        env = Environment(CPPDEFINES=c1, CPPDEFPREFIX='-D')
+        env = Environment(tools=['gcc'],CPPDEFINES=c1, CPPDEFPREFIX='-D')
         try:
             env.Append(CPPDEFINES=c2)
             final = env.subst('$_CPPDEFFLAGS', source="src", target="tgt")
             print(f"Append:\n    result={dlist(env['CPPDEFINES'])}\n    final={final}")
         except Exception as t:
             print(f"Append:\n    FAILED: {t}")
 
-        env = Environment(CPPDEFINES=c1, CPPDEFPREFIX='-D')
+        env = Environment(tools=['gcc'],CPPDEFINES=c1, CPPDEFPREFIX='-D')
         try:
             env.AppendUnique(CPPDEFINES=c2)
             final = env.subst('$_CPPDEFFLAGS', source="src", target="tgt")

test/CPPDEFINES/fixture/SConstruct-Prepend

@@ -8,46 +8,46 @@ DefaultEnvironment(tools=[])
 
 # Special cases:
 # https://github.com/SCons/scons/issues/1738
-env_1738_2 = Environment(CPPDEFPREFIX='-D')
+env_1738_2 = Environment(tools=['cc'],CPPDEFPREFIX='-D')
 env_1738_2['CPPDEFINES'] = ['FOO']
 env_1738_2.Prepend(CPPDEFINES={'value': '1'})
 print(env_1738_2.subst('$_CPPDEFFLAGS'))
 # env_1738_2.Object('test_1738_2', 'main.c')
 
 # https://github.com/SCons/scons/issues/2300
-env_2300_1 = Environment(CPPDEFINES='foo', CPPDEFPREFIX='-D')
+env_2300_1 = Environment(tools=['cc'],CPPDEFINES='foo', CPPDEFPREFIX='-D')
 env_2300_1.Prepend(CPPDEFINES='bar')
 print(env_2300_1.subst('$_CPPDEFFLAGS'))
 
-env_2300_2 = Environment(CPPDEFINES=['foo'], CPPDEFPREFIX='-D')  # note the list
+env_2300_2 = Environment(tools=['cc'],CPPDEFINES=['foo'], CPPDEFPREFIX='-D')  # note the list
 env_2300_2.Prepend(CPPDEFINES='bar')
 print(env_2300_2.subst('$_CPPDEFFLAGS'))
 
 # An initial space-separated string will be split, but not a string in a list.
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['cc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = "foo bar"
 env_multi.Prepend(CPPDEFINES="baz")
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['cc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = ["foo bar"]
 env_multi.Prepend(CPPDEFINES="baz")
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['cc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = "foo"
 env_multi.Prepend(CPPDEFINES=["bar baz"])
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['cc'],CPPDEFPREFIX='-D')
 env_multi['CPPDEFINES'] = "foo"
 env_multi.Prepend(CPPDEFINES="bar baz")
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
 # Check that PrependUnique(..., delete_existing=True) works as expected.
 # Each addition is in different but matching form, and different order
 # so we expect a reordered list, but with the same macro defines.
-env_multi = Environment(CPPDEFPREFIX='-D')
+env_multi = Environment(tools=['cc'],CPPDEFPREFIX='-D')
 env_multi.Prepend(CPPDEFINES=["Macro1=Value1", ("Macro2", "Value2"), {"Macro3": "Value3"}])
 try:
     env_multi.PrependUnique(CPPDEFINES="Macro2=Value2", delete_existing=True)
@@ -60,9 +60,9 @@ else:
     print(env_multi.subst('$_CPPDEFFLAGS'))
 
 # A lone tuple handled differently than a lone list.
-env_tuple = Environment(CPPDEFPREFIX='-D', CPPDEFINES=("Macro1", "Value1"))
+env_tuple = Environment(tools=['cc'],CPPDEFPREFIX='-D', CPPDEFINES=("Macro1", "Value1"))
 print(env_tuple.subst('$_CPPDEFFLAGS'))
-env_multi = Environment(CPPDEFPREFIX='-D', CPPDEFINES=["Macro1", "Value1"])
+env_multi = Environment(tools=['cc'],CPPDEFPREFIX='-D', CPPDEFINES=["Macro1", "Value1"])
 print(env_multi.subst('$_CPPDEFFLAGS'))
 
 # https://github.com/SCons/scons/issues/1152
@@ -115,15 +115,15 @@ for (t1, c1) in cases:
         orig = f"{c1!r}" if isinstance(c1, str) else c1
         pre = f"{c2!r}" if isinstance(c2, str) else c2
         print(f"   orig = {orig}, prepend = {pre}")
-        env = Environment(CPPDEFINES=c1, CPPDEFPREFIX='-D')
+        env = Environment(tools=['cc'],CPPDEFINES=c1, CPPDEFPREFIX='-D')
         try:
             env.Prepend(CPPDEFINES=c2)
             final = env.subst('$_CPPDEFFLAGS', source="src", target="tgt")
             print(f"Prepend:\n    result={dlist(env['CPPDEFINES'])}\n    final={final}")
         except Exception as t:
             print(f"Prepend:\n    FAILED: {t}")
 
-        env = Environment(CPPDEFINES=c1, CPPDEFPREFIX='-D')
+        env = Environment(tools=['cc'],CPPDEFINES=c1, CPPDEFPREFIX='-D')
         try:
             env.PrependUnique(CPPDEFINES=c2)
             final = env.subst('$_CPPDEFFLAGS', source="src", target="tgt")

test/CPPDEFINES/live.py

@@ -32,6 +32,7 @@
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 foo = Environment(CPPDEFINES=['FOO', ('VAL', '$VALUE')], VALUE=7)
 bar = Environment(CPPDEFINES={'BAR': None, 'VAL': 8})
 baz = Environment(CPPDEFINES=['BAZ', ('VAL', 9)])

test/CPPDEFINES/undefined.py

@@ -32,7 +32,8 @@
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
-env = Environment()
+DefaultEnvironment(tools=[])
+env = Environment(tools=['cc'])
 print(env.subst('$_CPPDEFFLAGS'))
 """)
 

test/Climb/filename--D.py

@@ -1,80 +1,79 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify the ability to use the -D option with the -f option to
-specify a different top-level file name.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-test.subdir('subdir', 'other')
-
-test.write('main.scons', """\
-DefaultEnvironment(tools=[])
-print("main.scons")
-SConscript('subdir/sub.scons')
-""")
-
-test.write(['subdir', 'sub.scons'], """\
-print("subdir/sub.scons")
-""")
-
-
-
-read_str = """\
-main.scons
-subdir/sub.scons
-"""
-
-expect = "scons: Entering directory `%s'\n" % test.workpath() \
-         + test.wrap_stdout(read_str = read_str,
-                            build_str = "scons: `subdir' is up to date.\n")
-
-test.run(chdir='subdir', arguments='-D -f main.scons .', stdout=expect)
-
-
-
-expect = test.wrap_stdout(read_str = "subdir/sub.scons\n",
-                          build_str = "scons: `.' is up to date.\n")
-
-test.run(chdir='other', arguments='-D -f ../subdir/sub.scons .', stdout=expect)
-
-test.run(chdir='other',
-         arguments='-D -f %s .' % test.workpath('subdir', 'sub.scons'),
-         stdout=expect)
-
-
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
+#!/usr/bin/env python
+#
+# MIT License
+#
+# Copyright The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+"""
+Verify the ability to use the -D option with the -f option to
+specify a different top-level file name.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir', 'other')
+
+test.write('main.scons', """\
+DefaultEnvironment(tools=[])
+print("main.scons")
+SConscript('subdir/sub.scons')
+""")
+
+test.write(['subdir', 'sub.scons'], """\
+print("subdir/sub.scons")
+""")
+
+
+
+read_str = """\
+main.scons
+subdir/sub.scons
+"""
+
+expect = "scons: Entering directory `%s'\n" % test.workpath() \
+         + test.wrap_stdout(read_str = read_str,
+                            build_str = "scons: `subdir' is up to date.\n")
+
+test.run(chdir='subdir', arguments='-D -f main.scons .', stdout=expect)
+
+
+
+expect = test.wrap_stdout(read_str = "subdir/sub.scons\n",
+                          build_str = "scons: `.' is up to date.\n")
+
+test.run(chdir='other', arguments='-D -f ../subdir/sub.scons .', stdout=expect)
+
+test.run(chdir='other',
+         arguments='-D -f %s .' % test.workpath('subdir', 'sub.scons'),
+         stdout=expect)
+
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: