Collect the scripts for the three "climb up" options (-D, -U and -u)

in a subdirectory.  Split sub-tests into separate scripts.  Clean things
up a bit.

9 files changed, 345 insertions, 142 deletions

diff --git a/test/Climb/U-Default-dir.py b/test/Climb/U-Default-dir.py
new file mode 100644
index 0000000..f9f3b5d
--- /dev/null
+++ b/test/Climb/U-Default-dir.py
@@ -0,0 +1,42 @@
+#!/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()
diff --git a/test/Climb/U-Default-no-target.py b/test/Climb/U-Default-no-target.py
new file mode 100644
index 0000000..6ae5f76
--- /dev/null
+++ b/test/Climb/U-Default-no-target.py
@@ -0,0 +1,44 @@
+#!/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, stderr="""\
+scons: *** Do not know how to make target `not_a_target.in'.  Stop.
+""")
+
+test.pass_test()
diff --git a/test/Climb/U-no-Default.py b/test/Climb/U-no-Default.py
new file mode 100644
index 0000000..987f06f
--- /dev/null
+++ b/test/Climb/U-no-Default.py
@@ -0,0 +1,42 @@
+#!/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()
diff --git a/test/Climb/explicit-parent--D.py b/test/Climb/explicit-parent--D.py
new file mode 100644
index 0000000..c76e63b
--- /dev/null
+++ b/test/Climb/explicit-parent--D.py
@@ -0,0 +1,74 @@
+#!/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])
+    source = map(str, source)
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(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()
diff --git a/test/Climb/explicit-parent--U.py b/test/Climb/explicit-parent--U.py
new file mode 100644
index 0000000..b3c61c0
--- /dev/null
+++ b/test/Climb/explicit-parent--U.py
@@ -0,0 +1,66 @@
+#!/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])
+    source = map(str, source)
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(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()
diff --git a/test/Climb/explicit-parent-u.py b/test/Climb/explicit-parent-u.py
new file mode 100644
index 0000000..eb4bd0d
--- /dev/null
+++ b/test/Climb/explicit-parent-u.py
@@ -0,0 +1,72 @@
+#!/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])
+    source = map(str, source)
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(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()
diff --git a/test/option--D.py b/test/Climb/option--D.py
index cca8ed1..7f3dc39 100644
--- a/test/option--D.py
+++ b/test/Climb/option--D.py
@@ -24,9 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
-import os
 
 _python_ = TestSCons._python_
 
@@ -72,54 +70,16 @@ test.write(['sub2', 'bar.in'], "sub2/bar.in")
 
 test.run(arguments = '-D', chdir = 'sub1')
 
-test.fail_test(test.read(['sub1', 'foo.out']) != "sub1/foo.in")
-test.fail_test(test.read(['sub2', 'bar.out']) != "sub2/bar.in")
+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.fail_test(os.path.exists(test.workpath('sub1', 'foo.out')))
-test.fail_test(not os.path.exists(test.workpath('sub2', 'bar.out')))
-
-# Make sure explicit targets beginning with ../ get built.
-test.subdir('sub6', ['sub6', 'dir'])
-
-test.write(['sub6', 'SConstruct'], """\
-def cat(env, source, target):
-    target = str(target[0])
-    source = map(str, source)
-    f = open(target, "wb")
-    for src in source:
-        f.write(open(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('dir/SConscript', "env")
-""")
-
-test.write(['sub6', 'f1.in'], "f1.in\n")
-test.write(['sub6', 'f2.in'], "f2.in\n")
-
-test.write(['sub6', 'dir', 'SConscript'], """\
-Import("env")
-f3 = env.Cat('f3.out', 'f3.in')
-env.Cat('f4.out', 'f4.in')
-Default(f3)
-""")
-
-test.write(['sub6', 'dir', 'f3.in'], "f3.in\n")
-test.write(['sub6', 'dir', 'f4.in'], "f4.in\n")
-
-test.run(chdir = 'sub6/dir', arguments = '-D ../f1.out')
-
-test.fail_test(not os.path.exists(test.workpath('sub6', 'f1.out')))
-test.fail_test(os.path.exists(test.workpath('sub6', 'f2.out')))
-test.fail_test(os.path.exists(test.workpath('sub6', 'dir', 'f3.out')))
-test.fail_test(os.path.exists(test.workpath('sub6', 'dir', 'f4.out')))
+test.must_not_exist(test.workpath('sub1', 'foo.out'))
+test.must_exist(test.workpath('sub2', 'bar.out'))
 
 
 test.pass_test()
diff --git a/test/option--U.py b/test/Climb/option--U.py
index 4781d35..93cebd3 100644
--- a/test/option--U.py
+++ b/test/Climb/option--U.py
@@ -24,8 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import os.path
 import sys
 
 import TestSCons
@@ -139,63 +137,4 @@ 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'))
 
-# Make sure that a Default() directory doesn't cause an exception.
-test.subdir('sub4')
-
-test.write(['sub4', 'SConstruct'], """
-Default('.')
-""")
-
-test.run(chdir = 'sub4', arguments = '-U')
-
-# Make sure no Default() targets doesn't cause an exception.
-test.subdir('sub5')
-
-test.write(['sub5', 'SConstruct'], "\n")
-
-test.run(chdir = 'sub5',
-         arguments = '-U',
-         stderr = "scons: *** No targets specified and no Default() targets found.  Stop.\n",
-         status = 2)
-
-#
-test.write('SConstruct', """
-Default('not_a_target.in')
-""")
-
-test.run(arguments = '-U', status=2, stderr="""\
-scons: *** Do not know how to make target `not_a_target.in'.  Stop.
-""")
-
-# Make sure explicit targets beginning with ../ get built.
-test.subdir('sub6', ['sub6', 'dir'])
-
-test.write(['sub6', 'SConstruct'], """\
-def cat(env, source, target):
-    target = str(target[0])
-    source = map(str, source)
-    f = open(target, "wb")
-    for src in source:
-        f.write(open(src, "rb").read())
-    f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
-env.Cat('foo.out', 'foo.in')
-SConscript('dir/SConscript', "env")
-""")
-
-test.write(['sub6', 'foo.in'], "foo.in\n")
-
-test.write(['sub6', 'dir', 'SConscript'], """\
-Import("env")
-bar = env.Cat('bar.out', 'bar.in')
-Default(bar)
-""")
-
-test.write(['sub6', 'dir', 'bar.in'], "bar.in\n")
-
-test.run(chdir = 'sub6/dir', arguments = '-U ../foo.out')
-
-test.must_exist(test.workpath('sub6', 'foo.out'))
-test.must_not_exist(test.workpath('sub6', 'dir', 'bar.out'))
-
 test.pass_test()
diff --git a/test/option-u.py b/test/Climb/option-u.py
index 572433f..bbacbc9 100644
--- a/test/option-u.py
+++ b/test/Climb/option-u.py
@@ -29,8 +29,7 @@ Test that the -u option only builds targets at or below
 the current directory.
 """
 
-import os.path
-import sys
+import os
 
 import TestSCons
 
@@ -140,40 +139,5 @@ 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")
 
-# Make sure explicit targets beginning with ../ get built.
-test.subdir('sub6', ['sub6', 'dir'])
-
-test.write(['sub6', 'SConstruct'], """\
-def cat(env, source, target):
-    target = str(target[0])
-    source = map(str, source)
-    f = open(target, "wb")
-    for src in source:
-        f.write(open(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('dir/SConscript', "env")
-""")
-
-test.write(['sub6', 'f1.in'], "f1.in\n")
-test.write(['sub6', 'f2.in'], "f2.in\n")
-
-test.write(['sub6', 'dir', 'SConscript'], """\
-Import("env")
-env.Cat('f3.out', 'f3.in')
-env.Cat('f4.out', 'f4.in')
-""")
-
-test.write(['sub6', 'dir', 'f3.in'], "f3.in\n")
-test.write(['sub6', 'dir', 'f4.in'], "f4.in\n")
-
-test.run(chdir = 'sub6/dir', arguments = '-u ../f2.out')
-
-test.must_not_exist(test.workpath('sub6', 'f1.out'))
-test.must_exist(test.workpath('sub6', 'f2.out'))
-test.must_not_exist(test.workpath('sub6', 'dir', 'f3.out'))
-test.must_not_exist(test.workpath('sub6', 'dir', 'f4.out'))
 
 test.pass_test()