Revert the previous change, I overlooked some regression test failures.

4 files changed, 112 insertions, 226 deletions

diff --git a/test/SConsignFile.py b/test/SConsignFile.py
new file mode 100644
index 0000000..e2b8053
--- /dev/null
+++ b/test/SConsignFile.py
@@ -0,0 +1,112 @@
+#!/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__"
+
+import TestSCons
+import os.path
+
+_python_ = TestSCons._python_
+
+test = TestSCons.TestSCons()
+
+test.subdir('work1', ['work1', 'subdir'])
+test.subdir('work2', ['work2', 'subdir'])
+
+test.write('build.py', r"""
+import sys
+contents = open(sys.argv[2], 'rb').read()
+file = open(sys.argv[1], 'wb')
+file.write(contents)
+file.close()
+""")
+
+#
+test.write(['work1', 'SConstruct'], """
+SConsignFile()
+B = Builder(action = '%(_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 = 'subdir/f3.out', source = 'subdir/f3.in')
+env.B(target = 'subdir/f4.out', source = 'subdir/f4.in')
+""" % locals())
+
+test.write(['work1', 'f1.in'], "work1/f1.in\n")
+test.write(['work1', 'f2.in'], "work1/f2.in\n")
+test.write(['work1', 'subdir', 'f3.in'], "work1/subdir/f3.in\n")
+test.write(['work1', 'subdir', 'f4.in'], "work1/subdir/f4.in\n")
+
+test.run(chdir = 'work1')
+
+test.must_exist(test.workpath('work1', '.sconsign.dblite'))
+test.must_not_exist(test.workpath('work1', '.sconsign'))
+test.must_not_exist(test.workpath('work1', 'subdir', '.sconsign'))
+  
+test.must_match(['work1', 'f1.out'], "work1/f1.in\n")
+test.must_match(['work1', 'f2.out'], "work1/f2.in\n")
+test.must_match(['work1', 'subdir', 'f3.out'], "work1/subdir/f3.in\n")
+test.must_match(['work1', 'subdir', 'f4.out'], "work1/subdir/f4.in\n")
+
+test.up_to_date(chdir = 'work1', arguments = '.')
+
+test.must_exist(test.workpath('work1', '.sconsign.dblite'))
+test.must_not_exist(test.workpath('work1', '.sconsign'))
+test.must_not_exist(test.workpath('work1', 'subdir', '.sconsign'))
+
+#
+test.write(['work2', 'SConstruct'], """
+e = Environment(XXX = 'scons')
+e.SConsignFile('my_${XXX}ign')
+B = Builder(action = '%(_python_)s ../build.py $TARGETS $SOURCES')
+env = Environment(BUILDERS = { 'B' : B })
+env.B(target = 'f5.out', source = 'f5.in')
+env.B(target = 'f6.out', source = 'f6.in')
+env.B(target = 'subdir/f7.out', source = 'subdir/f7.in')
+env.B(target = 'subdir/f8.out', source = 'subdir/f8.in')
+""" % locals())
+
+test.write(['work2', 'f5.in'], "work2/f5.in\n")
+test.write(['work2', 'f6.in'], "work2/f6.in\n")
+test.write(['work2', 'subdir', 'f7.in'], "work2/subdir/f7.in\n")
+test.write(['work2', 'subdir', 'f8.in'], "work2/subdir/f8.in\n")
+
+test.run(chdir = 'work2')
+
+test.must_exist(test.workpath('work2', 'my_sconsign.dblite'))
+test.must_not_exist(test.workpath('work2', '.sconsign'))
+test.must_not_exist(test.workpath('work2', 'subdir', '.sconsign'))
+
+test.must_match(['work2', 'f5.out'], "work2/f5.in\n")
+test.must_match(['work2', 'f6.out'], "work2/f6.in\n")
+test.must_match(['work2', 'subdir', 'f7.out'], "work2/subdir/f7.in\n")
+test.must_match(['work2', 'subdir', 'f8.out'], "work2/subdir/f8.in\n")
+
+test.up_to_date(chdir = 'work2', arguments = '.')
+
+test.must_exist(test.workpath('work2', 'my_sconsign.dblite'))
+test.must_not_exist(test.workpath('work2', '.sconsign'))
+test.must_not_exist(test.workpath('work2', 'subdir', '.sconsign'))
+
+test.pass_test()
diff --git a/test/SConsignFile/default.py b/test/SConsignFile/default.py
deleted file mode 100644
index 2e76c3d..0000000
--- a/test/SConsignFile/default.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/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 default behavior of SConsignFile(), called with no arguments.
-"""
-
-import TestSCons
-import os.path
-
-_python_ = TestSCons._python_
-
-test = TestSCons.TestSCons()
-
-test.subdir('subdir')
-
-test.write('build.py', r"""
-import sys
-contents = open(sys.argv[2], 'rb').read()
-file = open(sys.argv[1], 'wb')
-file.write(contents)
-file.close()
-sys.exit(0)
-""")
-
-#
-test.write('SConstruct', """
-SConsignFile()
-B = Builder(action = '%(_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 = 'subdir/f3.out', source = 'subdir/f3.in')
-env.B(target = 'subdir/f4.out', source = 'subdir/f4.in')
-""" % locals())
-
-test.write('f1.in', "f1.in\n")
-test.write('f2.in', "f2.in\n")
-test.write(['subdir', 'f3.in'], "subdir/f3.in\n")
-test.write(['subdir', 'f4.in'], "subdir/f4.in\n")
-
-test.run()
-
-test.must_exist(test.workpath('.sconsign.dblite'))
-test.must_not_exist(test.workpath('.sconsign'))
-test.must_not_exist(test.workpath('subdir', '.sconsign'))
-  
-test.must_match('f1.out', "f1.in\n")
-test.must_match('f2.out', "f2.in\n")
-test.must_match(['subdir', 'f3.out'], "subdir/f3.in\n")
-test.must_match(['subdir', 'f4.out'], "subdir/f4.in\n")
-
-test.up_to_date(arguments = '.')
-
-test.must_exist(test.workpath('.sconsign.dblite'))
-test.must_not_exist(test.workpath('.sconsign'))
-test.must_not_exist(test.workpath('subdir', '.sconsign'))
-
-test.pass_test()
diff --git a/test/SConsignFile/explicit-file.py b/test/SConsignFile/explicit-file.py
deleted file mode 100644
index 1c087ac..0000000
--- a/test/SConsignFile/explicit-file.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/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 default behavior of SConsignFile(), called with no arguments.
-"""
-
-import TestSCons
-import os.path
-
-_python_ = TestSCons._python_
-
-test = TestSCons.TestSCons()
-
-test.subdir('subdir')
-
-test.write('build.py', r"""
-import sys
-contents = open(sys.argv[2], 'rb').read()
-file = open(sys.argv[1], 'wb')
-file.write(contents)
-file.close()
-""")
-
-#
-test.write('SConstruct', """
-e = Environment(XXX = 'scons')
-e.SConsignFile('my_${XXX}ign')
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
-env = Environment(BUILDERS = { 'B' : B })
-env.B(target = 'f5.out', source = 'f5.in')
-env.B(target = 'f6.out', source = 'f6.in')
-env.B(target = 'subdir/f7.out', source = 'subdir/f7.in')
-env.B(target = 'subdir/f8.out', source = 'subdir/f8.in')
-""" % locals())
-
-test.write('f5.in', "f5.in\n")
-test.write('f6.in', "f6.in\n")
-test.write(['subdir', 'f7.in'], "subdir/f7.in\n")
-test.write(['subdir', 'f8.in'], "subdir/f8.in\n")
-
-test.run()
-
-test.must_exist(test.workpath('my_sconsign.dblite'))
-test.must_not_exist(test.workpath('.sconsign'))
-test.must_not_exist(test.workpath('subdir', '.sconsign'))
-
-test.must_match('f5.out', "f5.in\n")
-test.must_match('f6.out', "f6.in\n")
-test.must_match(['subdir', 'f7.out'], "subdir/f7.in\n")
-test.must_match(['subdir', 'f8.out'], "subdir/f8.in\n")
-
-test.up_to_date(arguments = '.')
-
-test.must_exist(test.workpath('my_sconsign.dblite'))
-test.must_not_exist(test.workpath('.sconsign'))
-test.must_not_exist(test.workpath('subdir', '.sconsign'))
-
-test.pass_test()
diff --git a/test/SConsignFile/make-directory.py b/test/SConsignFile/make-directory.py
deleted file mode 100644
index 819b5e2..0000000
--- a/test/SConsignFile/make-directory.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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 make a SConsignFile() in a non-existent
-subdirectory.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-test.write('SConstruct', """
-import SCons.dblite
-env = Environment()
-env.SConsignFile("sub/dir/sconsign", SCons.dblite)
-env.Install('bar', 'foo.txt')
-""")
-
-test.write('foo.txt', "Foo\n")
-
-expect = test.wrap_stdout(read_str = 'Mkdir("sub/dir")\n',
-              build_str = 'Install file: "foo.txt" as "bar/foo.txt"\n')
-
-test.run(options='-n', stdout=expect)
-
-test.must_not_exist(['bar', 'foo.txt'])
-
-test.must_not_exist('sub')
-test.must_not_exist(['sub', 'dir'])
-test.must_not_exist(['sub', 'dir', '.sconsign.dblite'])
-
-test.run(stdout=expect)
-
-test.must_match(['bar', 'foo.txt'], "Foo\n")
-
-test.must_exist(['sub', 'dir', 'sconsign.dblite'])
-
-test.pass_test()