12 files changed, 991 insertions, 0 deletions
diff --git a/test/Climb/U-Default-dir.py b/test/Climb/U-Default-dir.py
new file mode 100644
index 000000000..323ceb146
--- /dev/null
+++ b/test/Climb/U-Default-dir.py
@@ -0,0 +1,48 @@
+#!/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__"
+
+"""
+Make sure that a Default() directory doesn't cause an exception
+when used with the -U option.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """\
+Default('.')
+""")
+
+test.run(arguments = '-U')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-Default-no-target.py b/test/Climb/U-Default-no-target.py
new file mode 100644
index 000000000..ca03416cc
--- /dev/null
+++ b/test/Climb/U-Default-no-target.py
@@ -0,0 +1,50 @@
+#!/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__"
+
+"""
+Make sure a Default() target that doesn't exist is handled with
+the correct failure when used with the -U option.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+Default('not_a_target.in')
+""")
+
+test.run(arguments = '-U', status=2, match=TestSCons.match_re, stderr="""\
+scons: \*\*\* Do not know how to make File target `not_a_target.in' \(.*not_a_target.in\).  Stop.
+""")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-no-Default.py b/test/Climb/U-no-Default.py
new file mode 100644
index 000000000..24ed4bc8a
--- /dev/null
+++ b/test/Climb/U-no-Default.py
@@ -0,0 +1,48 @@
+#!/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__"
+
+"""
+Make sure no Default() targets in the SConstruct doesn't cause an
+exception when used with the -U option.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', "\n")
+
+test.run(arguments = '-U',
+         stderr = "scons: *** No targets specified and no Default() targets found.  Stop.\n",
+         status = 2)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent--D.py b/test/Climb/explicit-parent--D.py
new file mode 100644
index 000000000..f894e334d
--- /dev/null
+++ b/test/Climb/explicit-parent--D.py
@@ -0,0 +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__"
+
+"""
+Make sure explicit targets beginning with ../ get built correctly
+by the -D option.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir(['subdir'])
+
+test.write('SConstruct', """\
+def cat(env, source, target):
+    target = str(target[0])
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(str(src), "rb").read())
+    f.close()
+env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env.Cat('f1.out', 'f1.in')
+f2 = env.Cat('f2.out', 'f2.in')
+Default(f2)
+SConscript('subdir/SConscript', "env")
+""")
+
+test.write('f1.in', "f1.in\n")
+test.write('f2.in', "f2.in\n")
+
+test.write(['subdir', 'SConscript'], """\
+Import("env")
+f3 = env.Cat('f3.out', 'f3.in')
+env.Cat('f4.out', 'f4.in')
+Default(f3)
+""")
+
+test.write(['subdir', 'f3.in'], "subdir/f3.in\n")
+test.write(['subdir', 'f4.in'], "subdir/f4.in\n")
+
+test.run(chdir = 'subdir', arguments = '-D ../f1.out')
+
+test.must_exist(test.workpath('f1.out'))
+test.must_not_exist(test.workpath('f2.out'))
+test.must_not_exist(test.workpath('dir', 'f3.out'))
+test.must_not_exist(test.workpath('dir', 'f4.out'))
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent--U.py b/test/Climb/explicit-parent--U.py
new file mode 100644
index 000000000..ab2d33e05
--- /dev/null
+++ b/test/Climb/explicit-parent--U.py
@@ -0,0 +1,71 @@
+#!/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__"
+
+"""
+Make sure explicit targets beginning with ../ get built correctly.
+by the -U option.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir')
+
+test.write('SConstruct', """\
+def cat(env, source, target):
+    target = str(target[0])
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(str(src), "rb").read())
+    f.close()
+env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env.Cat('foo.out', 'foo.in')
+SConscript('subdir/SConscript', "env")
+""")
+
+test.write('foo.in', "foo.in\n")
+
+test.write(['subdir', 'SConscript'], """\
+Import("env")
+bar = env.Cat('bar.out', 'bar.in')
+Default(bar)
+""")
+
+test.write(['subdir', 'bar.in'], "subdir/bar.in\n")
+
+test.run(chdir = 'subdir', arguments = '-U ../foo.out')
+
+test.must_exist(test.workpath('foo.out'))
+test.must_not_exist(test.workpath('subdir', 'bar.out'))
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent-u.py b/test/Climb/explicit-parent-u.py
new file mode 100644
index 000000000..e3e774e16
--- /dev/null
+++ b/test/Climb/explicit-parent-u.py
@@ -0,0 +1,77 @@
+#!/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__"
+
+"""
+Test that the -u option only builds targets at or below
+the current directory.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+# Make sure explicit targets beginning with ../ get built.
+test.subdir('subdir')
+
+test.write('SConstruct', """\
+def cat(env, source, target):
+    target = str(target[0])
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(str(src), "rb").read())
+    f.close()
+env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env.Cat('f1.out', 'f1.in')
+env.Cat('f2.out', 'f2.in')
+SConscript('subdir/SConscript', "env")
+""")
+
+test.write('f1.in', "f1.in\n")
+test.write('f2.in', "f2.in\n")
+
+test.write(['subdir', 'SConscript'], """\
+Import("env")
+env.Cat('f3.out', 'f3.in')
+env.Cat('f4.out', 'f4.in')
+""")
+
+test.write(['subdir', 'f3.in'], "subdir/f3.in\n")
+test.write(['subdir', 'f4.in'], "subdir/f4.in\n")
+
+test.run(chdir = 'subdir', arguments = '-u ../f2.out')
+
+test.must_not_exist(test.workpath('f1.out'))
+test.must_exist(test.workpath('f2.out'))
+test.must_not_exist(test.workpath('dir', 'f3.out'))
+test.must_not_exist(test.workpath('dir', 'f4.out'))
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename--D.py b/test/Climb/filename--D.py
new file mode 100644
index 000000000..06d95e78b
--- /dev/null
+++ b/test/Climb/filename--D.py
@@ -0,0 +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', """\
+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:
diff --git a/test/Climb/filename--U.py b/test/Climb/filename--U.py
new file mode 100644
index 000000000..7f2e60dc4
--- /dev/null
+++ b/test/Climb/filename--U.py
@@ -0,0 +1,77 @@
+#!/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 -U 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', """\
+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='-U -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='-U -f ../subdir/sub.scons .', stdout=expect)
+
+test.run(chdir='other',
+         arguments='-U -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:
diff --git a/test/Climb/filename-u.py b/test/Climb/filename-u.py
new file mode 100644
index 000000000..7bae153fc
--- /dev/null
+++ b/test/Climb/filename-u.py
@@ -0,0 +1,77 @@
+#!/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 -u 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', """\
+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='-u -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='-u -f ../subdir/sub.scons .', stdout=expect)
+
+test.run(chdir='other',
+         arguments='-u -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:
diff --git a/test/Climb/option--D.py b/test/Climb/option--D.py
new file mode 100644
index 000000000..57c08534c
--- /dev/null
+++ b/test/Climb/option--D.py
@@ -0,0 +1,91 @@
+#!/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
+
+_python_ = TestSCons._python_
+
+test = TestSCons.TestSCons()
+
+test.subdir('sub1', 'sub2')
+
+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', """
+import SCons.Defaults
+B = Builder(action=r'%(_python_)s build.py $TARGET $SOURCES')
+env = Environment()
+env['BUILDERS']['B'] = B
+env.B(target = 'sub1/foo.out', source = 'sub1/foo.in')
+Export('env')
+SConscript('sub1/SConscript')
+SConscript('sub2/SConscript')
+""" % locals())
+
+test.write(['sub1', 'SConscript'], """
+Import('env')
+env.B(target = 'foo.out', source = 'foo.in')
+Default('.')
+""")
+
+test.write(['sub1', 'foo.in'], "sub1/foo.in")
+
+test.write(['sub2', 'SConscript'], """
+Import('env')
+env.Alias('bar', env.B(target = 'bar.out', source = 'bar.in'))
+Default('.')
+
+""")
+
+test.write(['sub2', 'bar.in'], "sub2/bar.in")
+
+test.run(arguments = '-D', chdir = 'sub1')
+
+test.must_match(['sub1', 'foo.out'], "sub1/foo.in")
+test.must_match(['sub2', 'bar.out'], "sub2/bar.in")
+
+test.unlink(['sub1', 'foo.out'])
+test.unlink(['sub2', 'bar.out'])
+
+test.run(arguments = '-D bar', chdir = 'sub1')
+
+test.must_not_exist(test.workpath('sub1', 'foo.out'))
+test.must_exist(test.workpath('sub2', 'bar.out'))
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option--U.py b/test/Climb/option--U.py
new file mode 100644
index 000000000..04ab26a1d
--- /dev/null
+++ b/test/Climb/option--U.py
@@ -0,0 +1,146 @@
+#!/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 sys
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+_python_ = TestSCons._python_
+
+test.subdir('sub1', 'sub2', 'sub3')
+
+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', r"""
+import SCons.Defaults
+env = Environment()
+env['BUILDERS']['B'] = Builder(action=r'%(_python_)s build.py $TARGET $SOURCES', multi=1)
+Default(env.B(target = 'sub1/foo.out', source = 'sub1/foo.in'))
+Export('env')
+SConscript('sub2/SConscript')
+Default(env.B(target = 'sub3/baz.out', source = 'sub3/baz.in'))
+VariantDir('sub2b', 'sub2')
+SConscript('sub2b/SConscript')
+Default(env.B(target = 'sub2/xxx.out', source = 'xxx.in'))
+SConscript('SConscript')
+""" % locals())
+
+test.write(['sub2', 'SConscript'], """
+Import('env')
+bar = env.B(target = 'bar.out', source = 'bar.in')
+Default(bar)
+env.Alias('bar', bar)
+Default(env.B(target = '../bar.out', source = 'bar.in'))
+""")
+
+
+test.write(['sub1', 'foo.in'], "sub1/foo.in\n")
+test.write(['sub2', 'bar.in'], "sub2/bar.in\n")
+test.write(['sub3', 'baz.in'], "sub3/baz.in\n")
+test.write('xxx.in', "xxx.in\n")
+
+test.write('SConscript', """assert GetLaunchDir() == r'%s'\n"""%test.workpath('sub1'))
+test.run(arguments = '-U foo.out', chdir = 'sub1')
+
+test.must_exist(test.workpath('sub1', 'foo.out'))
+test.must_not_exist(test.workpath('sub2', 'bar.out'))
+test.must_not_exist(test.workpath('sub2b', 'bar.out'))
+test.must_not_exist(test.workpath('sub3', 'baz.out'))
+test.must_not_exist(test.workpath('bar.out'))
+test.must_not_exist(test.workpath('sub2/xxx.out'))
+
+test.unlink(['sub1', 'foo.out'])
+
+test.write('SConscript', """\
+env = Environment()
+assert env.GetLaunchDir() == r'%s'
+"""%test.workpath('sub1'))
+test.run(arguments = '-U',
+         chdir = 'sub1',
+         stderr = "scons: *** No targets specified and no Default() targets found.  Stop.\n",
+         status = 2)
+test.must_not_exist(test.workpath('sub1', 'foo.out'))
+test.must_not_exist(test.workpath('sub2', 'bar.out'))
+test.must_not_exist(test.workpath('sub2b', 'bar.out'))
+test.must_not_exist(test.workpath('sub3', 'baz.out'))
+test.must_not_exist(test.workpath('bar.out'))
+test.must_not_exist(test.workpath('sub2/xxx.out'))
+
+
+if sys.platform == 'win32':
+    sub2 = 'SUB2'
+else:
+    sub2 = 'sub2'
+test.write('SConscript', """assert GetLaunchDir() == r'%s'"""%test.workpath(sub2))
+test.run(chdir = sub2, arguments = '-U')
+test.must_not_exist(test.workpath('sub1', 'foo.out'))
+test.must_exist(test.workpath('sub2', 'bar.out'))
+test.must_exist(test.workpath('sub2b', 'bar.out'))
+test.must_not_exist(test.workpath('sub3', 'baz.out'))
+test.must_exist(test.workpath('bar.out'))
+test.must_not_exist(test.workpath('sub2/xxx.out'))
+
+test.unlink(['sub2', 'bar.out'])
+test.unlink(['sub2b', 'bar.out'])
+test.unlink('bar.out')
+
+test.write('SConscript', """assert GetLaunchDir() == r'%s'"""%test.workpath())
+test.run(arguments='-U')
+test.must_exist(test.workpath('sub1', 'foo.out'))
+test.must_not_exist(test.workpath('sub2', 'bar.out'))
+test.must_not_exist(test.workpath('sub2b', 'bar.out'))
+test.must_exist(test.workpath('sub3', 'baz.out'))
+test.must_not_exist(test.workpath('bar.out'))
+test.must_exist(test.workpath('sub2/xxx.out'))
+
+test.unlink(['sub1', 'foo.out'])
+test.unlink(['sub3', 'baz.out'])
+test.unlink(['sub2', 'xxx.out'])
+
+test.write('SConscript', """assert GetLaunchDir() == r'%s'"""%test.workpath('sub3'))
+test.run(chdir = 'sub3', arguments='-U bar')
+test.must_not_exist(test.workpath('sub1', 'foo.out'))
+test.must_exist(test.workpath('sub2', 'bar.out'))
+test.must_exist(test.workpath('sub2b', 'bar.out'))
+test.must_not_exist(test.workpath('sub3', 'baz.out'))
+test.must_not_exist(test.workpath('bar.out'))
+test.must_not_exist(test.workpath('sub2/xxx.out'))
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option-u.py b/test/Climb/option-u.py
new file mode 100644
index 000000000..eeb2ccc46
--- /dev/null
+++ b/test/Climb/option-u.py
@@ -0,0 +1,148 @@
+#!/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__"
+
+"""
+Test that the -u option only builds targets at or below
+the current directory.
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('sub1',
+            'sub2', ['sub2', 'dir'],
+            'sub3',
+            'sub4', ['sub4', 'dir'])
+
+test.write('SConstruct', """
+def cat(env, source, target):
+    target = str(target[0])
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(str(src), "rb").read())
+    f.close()
+env = Environment()
+env.Append(BUILDERS = {'Cat' : Builder(action=cat)})
+env.Cat(target = 'sub1/f1a.out', source = 'sub1/f1a.in')
+env.Cat(target = 'sub1/f1b.out', source = 'sub1/f1b.in')
+Export('env')
+SConscript('sub2/SConscript')
+f3 = env.Cat(target = 'sub3/f3.out', source = 'sub3/f3.in')
+env.Alias('my_alias', f3)
+VariantDir('build', 'sub4')
+SConscript('build/SConscript')
+""")
+
+test.write(['sub2', 'SConscript'], """
+Import('env')
+env.Cat(target = 'f2a.out', source = 'f2a.in')
+env.Cat(target = 'dir/f2b.out', source = 'dir/f2b.in')
+""")
+
+test.write(['sub4', 'SConscript'], """
+Import('env')
+env.Cat(target = 'f4a.out', source = 'f4a.in')
+f4b_in = File('dir/f4b.in')
+f4b_in.exists()
+f4b_in.is_derived()
+env.Cat(target = 'dir/f4b.out', source = f4b_in)
+""")
+
+test.write(['sub1', 'f1a.in'], "sub1/f1a.in")
+test.write(['sub1', 'f1b.in'], "sub1/f1b.in")
+test.write(['sub2', 'f2a.in'], "sub2/f2a.in")
+test.write(['sub2', 'dir', 'f2b.in'], "sub2/dir/f2b.in")
+test.write(['sub3', 'f3.in'], "sub3/f3.in")
+test.write(['sub4', 'f4a.in'], "sub4/f4a.in")
+test.write(['sub4', 'dir', 'f4b.in'], "sub4/dir/f4b.in")
+
+# Verify that we only build the specified local argument.
+test.run(chdir = 'sub1', arguments = '-u f1a.out')
+
+test.must_match(['sub1', 'f1a.out'], "sub1/f1a.in")
+test.must_not_exist(test.workpath('sub1', 'sub1/f1b.out'))
+test.must_not_exist(test.workpath('sub2', 'f2a.out'))
+test.must_not_exist(test.workpath('sub2', 'dir', 'f2b.out'))
+test.must_not_exist(test.workpath('sub3', 'f3.out'))
+test.must_not_exist(test.workpath('sub4', 'f4a.out'))
+test.must_not_exist(test.workpath('sub4', 'dir', 'f4b.out'))
+test.must_not_exist(test.workpath('build', 'f4a.out'))
+test.must_not_exist(test.workpath('build', 'dir', 'f4b.out'))
+
+# Verify that we build everything at or below our current directory.
+test.run(chdir = 'sub2', arguments = '-u')
+
+test.must_not_exist(test.workpath('sub1', 'sub1/f1b.out'))
+test.must_match(['sub2', 'f2a.out'], "sub2/f2a.in")
+test.must_match(['sub2', 'dir', 'f2b.out'], "sub2/dir/f2b.in")
+test.must_not_exist(test.workpath('sub3', 'f3.out'))
+test.must_not_exist(test.workpath('sub4', 'f4a.out'))
+test.must_not_exist(test.workpath('sub4', 'dir', 'f4b.out'))
+test.must_not_exist(test.workpath('build', 'f4a.out'))
+test.must_not_exist(test.workpath('build', 'dir', 'f4b.out'))
+
+# Verify that we build a specified alias, regardless of where.
+test.run(chdir = 'sub2', arguments = '-u my_alias')
+
+test.must_not_exist(test.workpath('sub1', 'sub1/f1b.out'))
+test.must_match(['sub3', 'f3.out'], "sub3/f3.in")
+test.must_not_exist(test.workpath('sub4', 'f4a.out'))
+test.must_not_exist(test.workpath('sub4', 'dir', 'f4b.out'))
+test.must_not_exist(test.workpath('build', 'f4a.out'))
+test.must_not_exist(test.workpath('build', 'dir', 'f4b.out'))
+
+# Verify that we build things in a linked VariantDir.
+f4a_in = os.path.join('build', 'f4a.in')
+f4a_out = os.path.join('build', 'f4a.out')
+f4b_in = os.path.join('build', 'dir', 'f4b.in')
+f4b_out = os.path.join('build', 'dir', 'f4b.out')
+test.run(chdir = 'sub4',
+         arguments = '-u',
+         stdout = "scons: Entering directory `%s'\n" % test.workpath() + \
+                  test.wrap_stdout("""\
+scons: building associated VariantDir targets: build
+cat(["%s"], ["%s"])
+cat(["%s"], ["%s"])
+scons: `sub4' is up to date.
+""" % (f4b_out, f4b_in, f4a_out, f4a_in)))
+
+test.must_not_exist(test.workpath('sub1', 'sub1/f1b.out'))
+test.must_not_exist(test.workpath('sub4', 'f4a.out'))
+test.must_not_exist(test.workpath('sub4', 'dir', 'f4b.out'))
+test.must_match(['build', 'f4a.out'], "sub4/f4a.in")
+test.must_match(['build', 'dir', 'f4b.out'], "sub4/dir/f4b.in")
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: