Some minor test tweaking

Don't """code block""" % locals() if there's not actually a substitution
in the code block.  While there, fix any old-style file headers,
and add a DefaultEnvironment call if not present.

Signed-off-by: Mats Wichmann <mats@linux.com>

Author: mwichmann

bin/scons-time.py

@@ -278,6 +278,7 @@ class SConsTimer:
     name = 'scons-time'
     name_spaces = ' ' * len(name)
 
+    @staticmethod
     def makedict(**kw):
         return kw
 

test/CacheDir/value_dependencies/SConstruct

@@ -7,8 +7,8 @@ import SCons.Node
 CacheDir('cache')
 
 def b(target, source, env):
-	with open(target[0].abspath, 'w') as f:
-		pass
+    with open(target[0].abspath, 'w') as f:
+        pass
 
 def scan(node, env, path):
     """Have the node depend on a directory, which depends on a Value node."""

test/Configure/custom-tests.py

@@ -55,7 +55,7 @@
 """)
 
 test.write('SConstruct', """\
-DefaultEnvironment(tools=[])    
+DefaultEnvironment(tools=[])
 def CheckCustom(test):
     test.Message( 'Executing MyTest ... ' )
     retCompileOK                = test.TryCompile( '%(compileOK)s', '.c' )
@@ -164,7 +164,7 @@ def CheckEmptyDict(test):
 conf.CheckDict()
 conf.CheckEmptyDict()
 env = conf.Finish()
-""" % locals())
+""")
 
 test.run()
 

test/Errors/preparation.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# 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
@@ -20,9 +22,6 @@
 # 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__"
 
 """
 A currently disabled test that used to verify that we print a useful
@@ -49,14 +48,15 @@
 test.subdir('install', 'work')
 
 test.write(['work', 'SConstruct'], """\
+_ = DefaultEnvironment(tools=[])
 file_out = Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
 Alias("install", file_out)
 
 # Make a directory where we expect the File() to be.  This causes an
 # IOError or OSError when we try to open it to read its signature.
 import os
 os.mkdir('file.in')
-""" % locals())
+""")
 
 if sys.platform == 'win32':
     error_message = "Permission denied"

test/GetBuildFailures/option-k.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# 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
@@ -20,14 +22,11 @@
 # 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 that a failed build action with -k works as expected.
 """
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -85,7 +84,7 @@ def print_build_failures():
 scons: done building targets (errors occurred during build).
 f4 failed:  Error 1
 f5 failed:  Error 1
-""" % locals()
+"""
 
 expect_stderr = """\
 scons: *** [f4] Error 1
@@ -99,7 +98,7 @@ def print_build_failures():
 test.must_match(test.workpath('f3'), 'f3.in\n')
 test.must_not_exist(test.workpath('f4'))
 test.must_not_exist(test.workpath('f5'))
-test.must_match(test.workpath('f6'), 'f6.in\n') 
+test.must_match(test.workpath('f6'), 'f6.in\n')
 
 
 test.pass_test()

test/Java/JARCHDIR.py

@@ -32,7 +32,6 @@
 ${TARGET} or ${SOURCE} work.
 """
 
-
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -60,7 +59,7 @@
 source_env.Jar('out/s.jar', 'in/s.class')
 
 Default(bin, jar, inner)
-""" % locals())
+""")
 
 test.subdir('in')
 

test/Java/JARFLAGS.py

@@ -39,7 +39,7 @@
 env['JARFLAGS'] = 'cvf'
 class_files = env.Java(target='classes', source='src')
 env.Jar(target='test.jar', source=class_files)
-""" % locals())
+""")
 
 test.write(['src', 'Example1.java'], """\
 package src;
@@ -60,7 +60,7 @@
 jar cvf test.jar -C classes src.Example1\\.class
 .*
 adding: src.Example1\\.class.*
-""" % locals())
+""")
 
 
 test.run(arguments = '.',

test/Java/JAVACFLAGS.py

@@ -37,7 +37,7 @@
 DefaultEnvironment(tools=[])
 env = Environment(tools=['javac'], JAVACFLAGS='-O')
 env.Java(target='classes', source='src')
-""" % locals())
+""")
 
 test.write(['src', 'Example1.java'], """\
 package src;

test/Java/JAVACLASSPATH.py

@@ -59,7 +59,7 @@
 j1 = env.Java(target='class1', source='com.1/Example1.java')
 j2 = env.Java(target='class2', source='com.2/Example2.java')
 env.JavaH(target='outdir', source=[j1, j2], JAVACLASSPATH='class2')
-""" % locals())
+""")
 
 test.subdir('com.1', 'com.2')
 

test/Java/JAVAH.py

@@ -39,7 +39,7 @@
 
 # Skip this test as SCons doesn't (currently) predict the generated
 # inner/anonymous class generated .class files generated by gcj
-# and so will always fail 
+# and so will always fail
 if test.javac_is_gcj:
     test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n')
 
@@ -242,8 +242,7 @@ class Private {
 
 test.must_match(
     'wrapper.out',
-    "wrapper_with_args.py javah -d outdir2 -classpath class2 com.sub.bar.Example4 com.other.Example5 com.sub.bar.Example6\n"
-    % locals(),
+    "wrapper_with_args.py javah -d outdir2 -classpath class2 com.sub.bar.Example4 com.other.Example5 com.sub.bar.Example6\n",
     mode='r',
 )