Added test for TeX includes with same name as subdirs.

[scons.git] / test / up-to-date.py

diff --git a/test/up-to-date.py b/test/up-to-date.py
index 8311444a6162b1cc94aa8a1084845af3b65ac1bf..d7381bd7d7a7f4fbbb5e855f4a672938b41f8d81 100644 (file)
--- a/test/up-to-date.py
+++ b/test/up-to-date.py
@@ -24,12 +24,13 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os.path
-import string
-import sys
+"""
+Verify appropriate printing of "is up to date" messages.
+"""
+
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
@@ -42,13 +43,13 @@ file.close()
 """)
 
 test.write('SConstruct', """
-B = Builder(action = r'%s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS =  { 'B' : B })
 env.B(target = 'f1.out', source = 'f1.in')
 env.B(target = 'f2.out', source = 'f2.in')
 env.B(target = 'f3.out', source = 'f3.in')
 env.B(target = 'f4.out', source = 'f4.in')
-""" % python)
+""" % locals())
 
 test.write('f1.in', "f1.in\n")
 test.write('f2.in', "f2.in\n")
@@ -57,12 +58,32 @@ test.write('f4.in', "f4.in\n")
 
 test.run(arguments = 'f1.out f3.out')
 
-test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout =
-test.wrap_stdout("""scons: "f1.out" is up to date.
-%s build.py f2.out f2.in
-scons: "f3.out" is up to date.
-%s build.py f4.out f4.in
-""" % (python, python)))
+expect = test.wrap_stdout("""\
+scons: `f1.out' is up to date.
+%(_python_)s build.py f2.out f2.in
+scons: `f3.out' is up to date.
+%(_python_)s build.py f4.out f4.in
+""" % locals())
+
+test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout = expect)
+
+# Make sure all of the "up to date" messages get printed even when -j
+# is used.  This broke during signature refactoring development.
+expected_lines = [
+    "scons: `f1.out' is up to date.",
+    "scons: `f2.out' is up to date.",
+    "scons: `f3.out' is up to date.",
+    "scons: `f4.out' is up to date.",
+]
+
+test.run(options = '-j4 f1.out f2.out f3.out f4.out')
+
+test.must_contain_all_lines(test.stdout(), expected_lines)
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: