Fix some tests so they can still run on Windows system without

[scons.git] / test / exitfns.py

diff --git a/test/exitfns.py b/test/exitfns.py
index d9a1019fed960179b13f80d51737fbc9741ac8eb..3fc13228a39db8f1e3a10c514fe3fca4269a1c7f 100644 (file)
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -1,11 +1,32 @@
 #!/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__ = "test/exitfns.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestCmd
 import TestSCons
 
-test = TestSCons.TestSCons(match = TestCmd.match_exact)
+test = TestSCons.TestSCons()
 
 sconstruct = """
 from SCons.exitfuncs import *
@@ -25,7 +46,8 @@ register(x3, "no kwd args")
 
 """
 
-expected_output = """running x3('no kwd args', kwd=None)
+expected_output = test.wrap_stdout("scons: `.' is up to date.\n") + \
+"""running x3('no kwd args', kwd=None)
 running x3(5, kwd='bar')
 running x2(12)
 running x1
@@ -34,7 +56,7 @@ running x3('no kwd args', kwd=None)
 
 test.write('SConstruct', sconstruct)
 
-test.run(arguments='-f SConstruct', stdout = expected_output)
+test.run(arguments='-f SConstruct .', stdout = expected_output)
 
 test.write('SConstruct', """import sys
 def f():
@@ -43,6 +65,12 @@ def f():
 sys.exitfunc = f
 """ + sconstruct)
 
-test.run(arguments='-f SConstruct', stdout = expected_output)
+test.run(arguments='-f SConstruct .', stdout = expected_output)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: