Add more customizability: $BITKEEPERCOMSTR, $CVSCOMSTR, $RCS_COCOMSTR, $SCCSCOMSTR.

16 files changed, 2367 insertions, 0 deletions

diff --git a/test/BitKeeper/BITKEEPERCOM.py b/test/BitKeeper/BITKEEPERCOM.py
new file mode 100644
index 0000000..2b76cc3
--- /dev/null
+++ b/test/BitKeeper/BITKEEPERCOM.py
@@ -0,0 +1,121 @@
+#!/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 setting the $BITKEEPERCOM variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub')
+
+sub_BitKeeper = os.path.join('sub', 'BitKeeper')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-bk-get.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('BitKeeper/'+f, f)
+""")
+
+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(TOOLS = ['default', 'BitKeeper'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  BITKEEPERCOM='%(python)s my-bk-get.py $TARGET')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.BitKeeper())
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['BitKeeper', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['BitKeeper', 'aaa.in'], "BitKeeper/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['BitKeeper', 'ccc.in'], "BitKeeper/ccc.in\n")
+
+test.write(['BitKeeper', 'sub', 'ddd.in'], "BitKeeper/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['BitKeeper', 'sub', 'fff.in'], "BitKeeper/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+%(python)s my-bk-get.py %(sub_SConscript)s
+""" % locals(),
+                                   build_str = """\
+%(python)s my-bk-get.py aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+%(python)s my-bk-get.py ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+%(python)s my-bk-get.py %(sub_ddd_in)s
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+%(python)s my-bk-get.py %(sub_fff_in)s
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "BitKeeper/aaa.in\nchecked-out bbb.in\nBitKeeper/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "BitKeeper/sub/ddd.in\nchecked-out sub/eee.in\nBitKeeper/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/BitKeeper/BITKEEPERCOMSTR.py b/test/BitKeeper/BITKEEPERCOMSTR.py
new file mode 100644
index 0000000..604642b
--- /dev/null
+++ b/test/BitKeeper/BITKEEPERCOMSTR.py
@@ -0,0 +1,122 @@
+#!/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 customizing the output with the the $BITKEEPERCOMSTR variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub')
+
+sub_BitKeeper = os.path.join('sub', 'BitKeeper')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-bk-get.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('BitKeeper/'+f, f)
+""")
+
+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(TOOLS = ['default', 'BitKeeper'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  BITKEEPERCOM='%(python)s my-bk-get.py $TARGET',
+                  BITKEEPERCOMSTR='Checking out $TARGET from our fake BitKeeper')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.BitKeeper())
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['BitKeeper', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['BitKeeper', 'aaa.in'], "BitKeeper/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['BitKeeper', 'ccc.in'], "BitKeeper/ccc.in\n")
+
+test.write(['BitKeeper', 'sub', 'ddd.in'], "BitKeeper/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['BitKeeper', 'sub', 'fff.in'], "BitKeeper/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+Checking out %(sub_SConscript)s from our fake BitKeeper
+""" % locals(),
+                                   build_str = """\
+Checking out aaa.in from our fake BitKeeper
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+Checking out ccc.in from our fake BitKeeper
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+Checking out %(sub_ddd_in)s from our fake BitKeeper
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+Checking out %(sub_fff_in)s from our fake BitKeeper
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "BitKeeper/aaa.in\nchecked-out bbb.in\nBitKeeper/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "BitKeeper/sub/ddd.in\nchecked-out sub/eee.in\nBitKeeper/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/BitKeeper/BitKeeper.py b/test/BitKeeper/BitKeeper.py
new file mode 100644
index 0000000..6db48f4
--- /dev/null
+++ b/test/BitKeeper/BitKeeper.py
@@ -0,0 +1,347 @@
+#!/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 fetching source files from BitKeeper.
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+bk = test.where_is('bk')
+if not bk:
+    print "Could not find BitKeeper, skipping test(s)."
+    test.pass_test(1)
+
+try:
+    login = os.getlogin()
+except (AttributeError, OSError):
+    try:
+        login = os.environ['USER']
+    except KeyError:
+        login = 'USER'
+
+host = os.uname()[1]
+
+email = "%s@%s" % (login, host)
+
+test.subdir('BK', 'import', ['import', 'sub'])
+
+# Test using BitKeeper to fetch from SCCS/s.file files.
+sccs = test.where_is('sccs')
+if not sccs:
+    print "Could not find SCCS, skipping sub-test of BitKeeper using SCCS files."
+else:
+    test.subdir('work1',
+                ['work1', 'SCCS'],
+                ['work1', 'sub'],
+                ['work1', 'sub', 'SCCS'])
+    
+    for file in ['aaa.in', 'bbb.in', 'ccc.in']:
+        test.write(['work1', file], "work1/%s\n" % file)
+        args = "create %s" % file
+        test.run(chdir = 'work1', program = sccs, arguments = args, stderr = None)
+        test.unlink(['work1', file])
+        test.unlink(['work1', ','+file])
+    
+    test.write(['work1', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+    args = "create SConscript"
+    test.run(chdir = 'work1/sub', program = sccs, arguments = args, stderr = None)
+    test.unlink(['work1', 'sub', 'SConscript'])
+    test.unlink(['work1', 'sub', ',SConscript'])
+    
+    for file in ['ddd.in', 'eee.in', 'fff.in']:
+        test.write(['work1', 'sub', file], "work1/sub/%s\n" % file)
+        args = "create %s" % file
+        test.run(chdir = 'work1/sub', program = sccs, arguments = args, stderr = None)
+        test.unlink(['work1', 'sub', file])
+        test.unlink(['work1', 'sub', ','+file])
+
+    test.write(['work1', '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)},
+                  BITKEEPERGETFLAGS='-e')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.BitKeeper())
+SConscript('sub/SConscript', "env")
+""")
+
+    test.write(['work1', 'bbb.in'], "checked-out work1/bbb.in\n")
+
+    test.write(['work1', 'sub', 'eee.in'], "checked-out work1/sub/eee.in\n")
+
+    test.run(chdir = 'work1',
+             arguments = '.',
+             stdout = test.wrap_stdout(read_str = """\
+bk get -e sub/SConscript
+""",
+                                       build_str = """\
+bk get -e aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+bk get -e ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+bk get -e sub/ddd.in
+cat(["sub/ddd.out"], ["sub/ddd.in"])
+cat(["sub/eee.out"], ["sub/eee.in"])
+bk get -e sub/fff.in
+cat(["sub/fff.out"], ["sub/fff.in"])
+cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"])
+"""),
+             stderr = """\
+sub/SConscript 1.1 -> 1.2: 5 lines
+aaa.in 1.1 -> 1.2: 1 lines
+ccc.in 1.1 -> 1.2: 1 lines
+sub/ddd.in 1.1 -> 1.2: 1 lines
+sub/fff.in 1.1 -> 1.2: 1 lines
+""")
+
+    test.must_match(['work1', 'all'], "work1/aaa.in\nchecked-out work1/bbb.in\nwork1/ccc.in\n")
+
+    test.must_be_writable(test.workpath('work1', 'sub', 'SConscript'))
+    test.must_be_writable(test.workpath('work1', 'aaa.in'))
+    test.must_be_writable(test.workpath('work1', 'ccc.in'))
+    test.must_be_writable(test.workpath('work1', 'sub', 'ddd.in'))
+    test.must_be_writable(test.workpath('work1', 'sub', 'fff.in'))
+
+# Test using BitKeeper to fetch from RCS/file,v files.
+rcs = test.where_is('rcs')
+ci = test.where_is('ci')
+if not rcs:
+    print "Could not find RCS,\nskipping sub-test of BitKeeper using RCS files."
+elif not ci:
+    print "Could not find the RCS ci command,\nskipping sub-test of BitKeeper using RCS files."
+else:
+    test.subdir('work2',
+                ['work2', 'RCS'],
+                ['work2', 'sub'],
+                ['work2', 'sub', 'RCS'])
+
+    for file in ['aaa.in', 'bbb.in', 'ccc.in']:
+        test.write(['work2', file], "work2/%s\n" % file)
+        args = "-f -t%s %s" % (file, file)
+        test.run(chdir = 'work2', program = ci, arguments = args, stderr = None)
+
+    test.write(['work2', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+    args = "-f -tsub/SConscript sub/SConscript"
+    test.run(chdir = 'work2', program = ci, arguments = args, stderr = None)
+
+    for file in ['ddd.in', 'eee.in', 'fff.in']:
+        test.write(['work2', 'sub', file], "work2/sub/%s\n" % file)
+        args = "-f -tsub/%s sub/%s" % (file, file)
+        test.run(chdir = 'work2', program = ci, arguments = args, stderr = None)
+
+    test.no_result(os.path.exists(test.workpath('work2', 'aaa.in')))
+    test.no_result(os.path.exists(test.workpath('work2', 'bbb.in')))
+    test.no_result(os.path.exists(test.workpath('work2', 'ccc.in')))
+
+    test.no_result(os.path.exists(test.workpath('work2', 'sub', 'SConscript')))
+
+    test.no_result(os.path.exists(test.workpath('work2', 'sub', 'ddd.in')))
+    test.no_result(os.path.exists(test.workpath('work2', 'sub', 'eee.in')))
+    test.no_result(os.path.exists(test.workpath('work2', 'sub', 'fff.in')))
+
+    test.write(['work2', '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)},
+                  BITKEEPERGET='$BITKEEPER co',
+                  BITKEEPERGETFLAGS='-q')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.BitKeeper())
+SConscript('sub/SConscript', "env")
+""")
+
+    test.write(['work2', 'bbb.in'], "checked-out work2/bbb.in\n")
+
+    test.write(['work2', 'sub', 'eee.in'], "checked-out work2/sub/eee.in\n")
+
+    test.run(chdir = 'work2',
+             arguments = '.',
+             stdout = test.wrap_stdout(read_str = """\
+bk co -q sub/SConscript
+""",
+                                       build_str = """\
+bk co -q aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+bk co -q ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+bk co -q sub/ddd.in
+cat(["sub/ddd.out"], ["sub/ddd.in"])
+cat(["sub/eee.out"], ["sub/eee.in"])
+bk co -q sub/fff.in
+cat(["sub/fff.out"], ["sub/fff.in"])
+cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"])
+"""))
+
+    test.must_match(['work2', 'all'], "work2/aaa.in\nchecked-out work2/bbb.in\nwork2/ccc.in\n")
+
+    test.must_match(['work2', 'sub', 'all'], "work2/sub/ddd.in\nchecked-out work2/sub/eee.in\nwork2/sub/fff.in\n")
+
+    test.must_not_be_writable(test.workpath('work2', 'sub', 'SConscript'))
+    test.must_not_be_writable(test.workpath('work2', 'aaa.in'))
+    test.must_not_be_writable(test.workpath('work2', 'ccc.in'))
+    test.must_not_be_writable(test.workpath('work2', 'sub', 'ddd.in'))
+    test.must_not_be_writable(test.workpath('work2', 'sub', 'fff.in'))
+
+# Set up a "pure" BitKeeper hierarchy.
+# BitKeeper's licensing restrictions require a configuration file that
+# specifies you're not using it multi-user.  This seems to be the
+# minimal configuration that satisfies these requirements.
+test.write('bk.conf', """\
+description:test project 'foo'
+logging:none
+email:%s
+single_user:%s
+single_host:%s
+""" % (email, login, host))
+
+# Plus, we need to set the external environment variable that gets it to
+# shut up and not prompt us to accept the license.
+os.environ['BK_LICENSE'] = 'ACCEPTED'
+
+test.write(['import', 'aaa.in'], "import/aaa.in\n")
+test.write(['import', 'bbb.in'], "import/bbb.in\n")
+test.write(['import', 'ccc.in'], "import/ccc.in\n")
+
+test.write(['import', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['import', 'sub', 'ddd.in'], "import/sub/ddd.in\n")
+test.write(['import', 'sub', 'eee.in'], "import/sub/eee.in\n")
+test.write(['import', 'sub', 'fff.in'], "import/sub/fff.in\n")
+
+# Test transparent source file checkouts using BitKeeper, by overriding
+# the 'SCCS' construction variable in the default Environment.
+work3 = test.workpath('work3')
+
+test.run(program = bk,
+         arguments = 'setup -f -c bk.conf work3')
+
+test.run(chdir = 'import',
+         program = bk,
+         arguments = 'import -q -f -tplain . %s' % test.workpath('work3'))
+
+test.write(['work3', '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()
+DefaultEnvironment(tools=['SCCS'])['SCCS'] = r'%s'
+env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+SConscript('sub/SConscript', "env")
+""" % bk)
+
+test.write(['work3', 'bbb.in'], "work3/bbb.in\n")
+
+test.subdir(['work3', 'sub'])
+test.write(['work3', 'sub', 'eee.in'], "work3/sub/eee.in\n")
+
+test.run(chdir = 'work3',
+         arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+%s get sub/SConscript
+""" % bk,
+                                   build_str = """\
+%s get aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+%s get ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+%s get sub/ddd.in
+cat(["sub/ddd.out"], ["sub/ddd.in"])
+cat(["sub/eee.out"], ["sub/eee.in"])
+%s get sub/fff.in
+cat(["sub/fff.out"], ["sub/fff.in"])
+cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"])
+""" % (bk, bk, bk, bk)),
+         stderr = """\
+sub/SConscript 1.1: 5 lines
+aaa.in 1.1: 1 lines
+ccc.in 1.1: 1 lines
+sub/ddd.in 1.1: 1 lines
+sub/fff.in 1.1: 1 lines
+""")
+
+test.must_match(['work3', 'all'], "import/aaa.in\nwork3/bbb.in\nimport/ccc.in\n")
+
+test.must_match(['work3', 'sub', 'all'], "import/sub/ddd.in\nwork3/sub/eee.in\nimport/sub/fff.in\n")
+
+test.must_not_be_writable(test.workpath('work3', 'sub', 'SConscript'))
+test.must_not_be_writable(test.workpath('work3', 'aaa.in'))
+test.must_not_be_writable(test.workpath('work3', 'ccc.in'))
+test.must_not_be_writable(test.workpath('work3', 'sub', 'ddd.in'))
+test.must_not_be_writable(test.workpath('work3', 'sub', 'fff.in'))
+
+test.pass_test()
diff --git a/test/CVS.py b/test/CVS.py
new file mode 100644
index 0000000..abdffe2
--- /dev/null
+++ b/test/CVS.py
@@ -0,0 +1,299 @@
+#!/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 fetching source files from CVS.
+"""
+
+import os
+import os.path
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+cvs = test.where_is('cvs')
+if not cvs:
+    print "Could not find CVS, skipping test(s)."
+    test.pass_test(1)
+
+test.subdir('CVS', 'import', ['import', 'sub'], 'work1', 'work2')
+
+foo_aaa_in = os.path.join('foo', 'aaa.in')
+foo_bbb_in = os.path.join('foo', 'bbb.in')
+foo_ccc_in = os.path.join('foo', 'ccc.in')
+foo_sub_ddd_in = os.path.join('foo', 'sub', 'ddd.in')
+foo_sub_ddd_out = os.path.join('foo', 'sub', 'ddd.out')
+foo_sub_eee_in = os.path.join('foo', 'sub', 'eee.in')
+foo_sub_eee_out = os.path.join('foo', 'sub', 'eee.out')
+foo_sub_fff_in = os.path.join('foo', 'sub', 'fff.in')
+foo_sub_fff_out = os.path.join('foo', 'sub', 'fff.out')
+foo_sub_all = os.path.join('foo', 'sub', 'all')
+
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+sub_all = os.path.join('sub', 'all')
+
+# Set up the CVS repository.
+cvsroot = test.workpath('CVS')
+
+os.environ['CVSROOT'] = cvsroot
+test.run(program = cvs, arguments = 'init')
+
+test.write(['import', 'aaa.in'], "import/aaa.in\n")
+test.write(['import', 'bbb.in'], "import/bbb.in\n")
+test.write(['import', 'ccc.in'], "import/ccc.in\n")
+
+test.write(['import', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['import', 'sub', 'ddd.in'], "import/sub/ddd.in\n")
+test.write(['import', 'sub', 'eee.in'], "import/sub/eee.in\n")
+test.write(['import', 'sub', 'fff.in'], "import/sub/fff.in\n")
+
+test.run(chdir = 'import',
+         program = cvs,
+         arguments = '-q import -m import foo v v-r')
+
+# Test the most straightforward CVS checkouts, using the module name.
+test.write(['work1', 'SConstruct'], """
+import os
+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(ENV = { 'PATH' : os.environ['PATH'] },
+                  BUILDERS={'Cat':Builder(action=cat)})
+env.Prepend(CVSFLAGS='-Q')
+env.Cat('aaa.out', 'foo/aaa.in')
+env.Cat('bbb.out', 'foo/bbb.in')
+env.Cat('ccc.out', 'foo/ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.CVS(r'%(cvsroot)s'))
+SConscript('foo/sub/SConscript', "env")
+""" % locals())
+
+test.subdir(['work1', 'foo'])
+test.write(['work1', 'foo', 'bbb.in'], "work1/foo/bbb.in\n")
+
+test.subdir(['work1', 'foo', 'sub',])
+test.write(['work1', 'foo', 'sub', 'eee.in'], "work1/foo/sub/eee.in\n")
+
+test.run(chdir = 'work1',
+         arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+cvs -Q -d %(cvsroot)s co foo/sub/SConscript
+""" % locals(),
+                                   build_str = """\
+cvs -Q -d %(cvsroot)s co foo/aaa.in
+cat(["aaa.out"], ["%(foo_aaa_in)s"])
+cat(["bbb.out"], ["%(foo_bbb_in)s"])
+cvs -Q -d %(cvsroot)s co foo/ccc.in
+cat(["ccc.out"], ["%(foo_ccc_in)s"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+cvs -Q -d %(cvsroot)s co foo/sub/ddd.in
+cat(["%(foo_sub_ddd_out)s"], ["%(foo_sub_ddd_in)s"])
+cat(["%(foo_sub_eee_out)s"], ["%(foo_sub_eee_in)s"])
+cvs -Q -d %(cvsroot)s co foo/sub/fff.in
+cat(["%(foo_sub_fff_out)s"], ["%(foo_sub_fff_in)s"])
+cat(["%(foo_sub_all)s"], ["%(foo_sub_ddd_out)s", "%(foo_sub_eee_out)s", "%(foo_sub_fff_out)s"])
+""" % locals()))
+
+# Checking things back out of CVS apparently messes with the line
+# endings, so read the result files in non-binary mode.
+
+test.must_match(['work1', 'all'],
+                "import/aaa.in\nwork1/foo/bbb.in\nimport/ccc.in\n",
+                mode='r')
+
+test.must_match(['work1', 'foo', 'sub', 'all'],
+                "import/sub/ddd.in\nwork1/foo/sub/eee.in\nimport/sub/fff.in\n",
+                mode='r')
+
+test.must_be_writable(test.workpath('work1', 'foo', 'sub', 'SConscript'))
+test.must_be_writable(test.workpath('work1', 'foo', 'aaa.in'))
+test.must_be_writable(test.workpath('work1', 'foo', 'ccc.in'))
+test.must_be_writable(test.workpath('work1', 'foo', 'sub', 'ddd.in'))
+test.must_be_writable(test.workpath('work1', 'foo', 'sub', 'fff.in'))
+
+# Test CVS checkouts when the module name is specified.
+test.write(['work2', 'SConstruct'], """
+import os
+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(ENV = { 'PATH' : os.environ['PATH'] },
+                  BUILDERS={'Cat':Builder(action=cat)})
+env.Prepend(CVSFLAGS='-q')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.CVS(r'%(cvsroot)s', 'foo'))
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['work2', 'bbb.in'], "work2/bbb.in\n")
+
+test.subdir(['work2', 'sub'])
+test.write(['work2', 'sub', 'eee.in'], "work2/sub/eee.in\n")
+
+test.run(chdir = 'work2',
+         arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+cvs -q -d %(cvsroot)s co -d sub foo/sub/SConscript
+U sub/SConscript
+""" % locals(),
+                                   build_str = """\
+cvs -q -d %(cvsroot)s co -d . foo/aaa.in
+U ./aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+cvs -q -d %(cvsroot)s co -d . foo/ccc.in
+U ./ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+cvs -q -d %(cvsroot)s co -d sub foo/sub/ddd.in
+U sub/ddd.in
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+cvs -q -d %(cvsroot)s co -d sub foo/sub/fff.in
+U sub/fff.in
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+# Checking things back out of CVS apparently messes with the line
+# endings, so read the result files in non-binary mode.
+
+test.must_match(['work2', 'all'],
+                "import/aaa.in\nwork2/bbb.in\nimport/ccc.in\n",
+                mode='r')
+
+test.must_match(['work2', 'sub', 'all'],
+                "import/sub/ddd.in\nwork2/sub/eee.in\nimport/sub/fff.in\n",
+                mode='r')
+
+test.must_be_writable(test.workpath('work2', 'sub', 'SConscript'))
+test.must_be_writable(test.workpath('work2', 'aaa.in'))
+test.must_be_writable(test.workpath('work2', 'ccc.in'))
+test.must_be_writable(test.workpath('work2', 'sub', 'ddd.in'))
+test.must_be_writable(test.workpath('work2', 'sub', 'fff.in'))
+
+# Test checking out specific file name(s), and expanding
+# the repository name with a variable.
+test.subdir(['work3'])
+
+test.write(['work3', 'SConstruct'], """\
+import os
+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(ENV = { 'PATH' : os.environ['PATH'] },
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  CVSROOT=r'%s')
+env.Prepend(CVSFLAGS='-q')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+cvs = env.CVS('$CVSROOT', 'foo')
+#env.SourceCode('.', cvs)
+env.SourceCode('aaa.in', cvs)
+env.SourceCode('bbb.in', cvs)
+env.SourceCode('ccc.in', cvs)
+""" % cvsroot)
+
+test.run(chdir = 'work3',
+         arguments = '.',
+         stdout = test.wrap_stdout(build_str = """\
+cvs -q -d %(cvsroot)s co -d . foo/aaa.in
+U ./aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cvs -q -d %(cvsroot)s co -d . foo/bbb.in
+U ./bbb.in
+cat(["bbb.out"], ["bbb.in"])
+cvs -q -d %(cvsroot)s co -d . foo/ccc.in
+U ./ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+""" % locals()))
+
+test.must_match(['work3', 'aaa.out'],
+                "import/aaa.in\n",
+                mode='r')
+test.must_match(['work3', 'bbb.out'],
+                "import/bbb.in\n",
+                mode='r')
+test.must_match(['work3', 'ccc.out'],
+                "import/ccc.in\n",
+                mode='r')
+test.must_match(['work3', 'all'],
+                "import/aaa.in\nimport/bbb.in\nimport/ccc.in\n",
+                mode='r')
+
+# Test CVS checkouts from a remote server (Tigris.org).
+test.subdir(['work4'])
+
+test.write(['work4', 'SConstruct'], """\
+import os
+env = Environment(ENV = { 'PATH' : os.environ['PATH'] })
+# We used to use the SourceForge server, but SourceForge has restrictions
+# that make them deny access on occasion.  Leave the incantation here
+# in case we need to use it again some day.
+#cvs = env.CVS(':pserver:anonymous@cvs.sourceforge.net:/cvsroot/scons')
+cvs = env.CVS(':pserver:anoncvs@cvs.tigris.org:/cvs')
+env.SourceCode('.', cvs)
+env.Install('install', 'scons/SConstruct')
+""")
+
+test.run(chdir = 'work4', arguments = '.')
+
+test.must_exist(test.workpath('work4', 'install', 'SConstruct'))
+
+
+test.pass_test()
diff --git a/test/CVSCOM.py b/test/CVSCOM.py
new file mode 100644
index 0000000..f8eaa6a
--- /dev/null
+++ b/test/CVSCOM.py
@@ -0,0 +1,121 @@
+#!/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 setting the $CVSCOM variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('CVS', ['CVS', 'sub'], 'sub')
+
+sub_CVS = os.path.join('sub', 'CVS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-cvs-co-.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('CVS/'+f, f)
+""")
+
+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(TOOLS = ['default', 'CVS'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  CVSCOM='%(python)s my-cvs-co-.py $TARGET')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.CVS(None))
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['CVS', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['CVS', 'aaa.in'], "CVS/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['CVS', 'ccc.in'], "CVS/ccc.in\n")
+
+test.write(['CVS', 'sub', 'ddd.in'], "CVS/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['CVS', 'sub', 'fff.in'], "CVS/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+%(python)s my-cvs-co-.py %(sub_SConscript)s
+""" % locals(),
+                                   build_str = """\
+%(python)s my-cvs-co-.py aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+%(python)s my-cvs-co-.py ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+%(python)s my-cvs-co-.py %(sub_ddd_in)s
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+%(python)s my-cvs-co-.py %(sub_fff_in)s
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "CVS/aaa.in\nchecked-out bbb.in\nCVS/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "CVS/sub/ddd.in\nchecked-out sub/eee.in\nCVS/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/CVSCOMSTR.py b/test/CVSCOMSTR.py
new file mode 100644
index 0000000..78c40f7
--- /dev/null
+++ b/test/CVSCOMSTR.py
@@ -0,0 +1,122 @@
+#!/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 customizing the output with the the $CVSCOMSTR variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('CVS', ['CVS', 'sub'], 'sub')
+
+sub_CVS = os.path.join('sub', 'CVS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-cvs-co.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('CVS/'+f, f)
+""")
+
+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(TOOLS = ['default', 'CVS'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  CVSCOM='%(python)s my-cvs-co.py $TARGET',
+                  CVSCOMSTR='Checking out $TARGET from our fake CVS')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.CVS(None))
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['CVS', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['CVS', 'aaa.in'], "CVS/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['CVS', 'ccc.in'], "CVS/ccc.in\n")
+
+test.write(['CVS', 'sub', 'ddd.in'], "CVS/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['CVS', 'sub', 'fff.in'], "CVS/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+Checking out %(sub_SConscript)s from our fake CVS
+""" % locals(),
+                                   build_str = """\
+Checking out aaa.in from our fake CVS
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+Checking out ccc.in from our fake CVS
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+Checking out %(sub_ddd_in)s from our fake CVS
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+Checking out %(sub_fff_in)s from our fake CVS
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "CVS/aaa.in\nchecked-out bbb.in\nCVS/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "CVS/sub/ddd.in\nchecked-out sub/eee.in\nCVS/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/RCS/RCS_COCOM.py b/test/RCS/RCS_COCOM.py
new file mode 100644
index 0000000..a151d69
--- /dev/null
+++ b/test/RCS/RCS_COCOM.py
@@ -0,0 +1,121 @@
+#!/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 setting the $RCS_COCOM variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('RCS', ['RCS', 'sub'], 'sub')
+
+sub_RCS = os.path.join('sub', 'RCS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-rcs-co.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('RCS/'+f, f)
+""")
+
+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(TOOLS = ['default', 'RCS'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  RCS_COCOM='%(python)s my-rcs-co.py $TARGET')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.RCS())
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['RCS', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['RCS', 'aaa.in'], "RCS/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['RCS', 'ccc.in'], "RCS/ccc.in\n")
+
+test.write(['RCS', 'sub', 'ddd.in'], "RCS/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['RCS', 'sub', 'fff.in'], "RCS/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+%(python)s my-rcs-co.py %(sub_SConscript)s
+""" % locals(),
+                                   build_str = """\
+%(python)s my-rcs-co.py aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+%(python)s my-rcs-co.py ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+%(python)s my-rcs-co.py %(sub_ddd_in)s
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+%(python)s my-rcs-co.py %(sub_fff_in)s
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "RCS/aaa.in\nchecked-out bbb.in\nRCS/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "RCS/sub/ddd.in\nchecked-out sub/eee.in\nRCS/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/RCS/RCS_COCOMSTR.py b/test/RCS/RCS_COCOMSTR.py
new file mode 100644
index 0000000..9e17418
--- /dev/null
+++ b/test/RCS/RCS_COCOMSTR.py
@@ -0,0 +1,122 @@
+#!/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 customizing the output with the the $RCS_COCOMSTR variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('RCS', ['RCS', 'sub'], 'sub')
+
+sub_RCS = os.path.join('sub', 'RCS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-rcs-co.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('RCS/'+f, f)
+""")
+
+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(TOOLS = ['default', 'RCS'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  RCS_COCOM='%(python)s my-rcs-co.py $TARGET',
+                  RCS_COCOMSTR='Checking out $TARGET from our fake RCS')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.RCS())
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['RCS', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['RCS', 'aaa.in'], "RCS/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['RCS', 'ccc.in'], "RCS/ccc.in\n")
+
+test.write(['RCS', 'sub', 'ddd.in'], "RCS/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['RCS', 'sub', 'fff.in'], "RCS/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+Checking out %(sub_SConscript)s from our fake RCS
+""" % locals(),
+                                   build_str = """\
+Checking out aaa.in from our fake RCS
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+Checking out ccc.in from our fake RCS
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+Checking out %(sub_ddd_in)s from our fake RCS
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+Checking out %(sub_fff_in)s from our fake RCS
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "RCS/aaa.in\nchecked-out bbb.in\nRCS/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "RCS/sub/ddd.in\nchecked-out sub/eee.in\nRCS/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/RCS/explicit.py b/test/RCS/explicit.py
new file mode 100644
index 0000000..39ea834
--- /dev/null
+++ b/test/RCS/explicit.py
@@ -0,0 +1,160 @@
+#!/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 explicit checkouts from local RCS files.
+"""
+
+import os.path
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+rcs = test.where_is('rcs')
+if not rcs:
+    print "Could not find RCS, skipping test(s)."
+    test.pass_test(1)
+
+ci = test.where_is('ci')
+if not ci:
+    print "Could not find `ci' command, skipping test(s)."
+    test.pass_test(1)
+
+
+
+test.subdir('sub')
+
+sub_RCS = os.path.join('sub', 'RCS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+for f in ['aaa.in', 'bbb.in', 'ccc.in']:
+    test.write(f, "%s\n" % f)
+    args = "-f -t%s %s" % (f, f)
+    test.run(program = ci, arguments = args, stderr = None)
+
+test.write(['sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+args = "-f -tsub/SConscript sub/SConscript"
+test.run(program = ci, arguments = args, stderr = None)
+
+for f in ['ddd.in', 'eee.in', 'fff.in']:
+    test.write(['sub', f], "sub/%s\n" % f)
+    args = "-f -tsub/%s sub/%s" % (f, f)
+    test.run(program = ci, arguments = args, stderr = None)
+
+test.no_result(os.path.exists(test.workpath('aaa.in')))
+test.no_result(os.path.exists(test.workpath('bbb.in')))
+test.no_result(os.path.exists(test.workpath('ccc.in')))
+
+test.no_result(os.path.exists(test.workpath('sub', 'SConscript')))
+
+test.no_result(os.path.exists(test.workpath('sub', 'ddd.in')))
+test.no_result(os.path.exists(test.workpath('sub', 'eee.in')))
+test.no_result(os.path.exists(test.workpath('sub', 'fff.in')))
+
+test.write('SConstruct', """
+import os
+for key in ['LOGNAME', 'USERNAME', 'USER']:
+    logname = os.environ.get(key)
+    if logname: break
+ENV = {'PATH' : os.environ['PATH'],
+       'LOGNAME' : logname}
+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(ENV=ENV,
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  RCS_COFLAGS='-q')
+DefaultEnvironment()['ENV'] = ENV
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.RCS())
+SConscript('sub/SConscript', "env")
+""")
+
+test.write('bbb.in', "checked-out bbb.in\n")
+
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+co -q %(sub_SConscript)s
+""" % locals(),
+                                   build_str = """\
+co -q aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+co -q ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+co -q %(sub_ddd_in)s
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+co -q %(sub_fff_in)s
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+# Checking things back out of RCS apparently messes with the line
+# endings, so read the result files in non-binary mode.
+
+test.must_match('all',
+                "aaa.in\nchecked-out bbb.in\nccc.in\n",
+                mode='r')
+
+test.must_match(['sub', 'all'],
+                "sub/ddd.in\nchecked-out sub/eee.in\nsub/fff.in\n",
+                mode='r')
+
+test.must_not_be_writable(test.workpath('sub', 'SConscript'))
+test.must_not_be_writable(test.workpath('aaa.in'))
+test.must_not_be_writable(test.workpath('ccc.in'))
+test.must_not_be_writable(test.workpath('sub', 'ddd.in'))
+test.must_not_be_writable(test.workpath('sub', 'fff.in'))
+
+
+
+#
+test.pass_test()
diff --git a/test/RCS/implicit.py b/test/RCS/implicit.py
new file mode 100644
index 0000000..684a24b
--- /dev/null
+++ b/test/RCS/implicit.py
@@ -0,0 +1,85 @@
+#!/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 transparent RCS checkouts of implicit dependencies.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+rcs = test.where_is('rcs')
+if not rcs:
+    print "Could not find RCS, skipping test(s)."
+    test.pass_test(1)
+
+ci = test.where_is('ci')
+if not ci:
+    print "Could not find `ci' command, skipping test(s)."
+    test.pass_test(1)
+
+
+
+test.subdir('RCS')
+
+test.write('foo.c', """\
+#include "foo.h"
+int
+main(int argc, char *argv[]) {
+    printf(STR);
+    printf("foo.c\\n");
+}
+""")
+test.run(program = ci,
+         arguments = "-f -tfoo.c foo.c",
+         stderr = None)
+
+test.write('foo.h', """\
+#define STR     "foo.h\\n"
+""")
+test.run(program = ci,
+         arguments = "-f -tfoo.h foo.h",
+         stderr = None)
+
+test.write('SConstruct', """
+env = Environment()
+env.Program('foo.c')
+""")
+
+test.run(stderr="""\
+RCS/foo.c,v  -->  foo.c
+revision 1.1
+done
+RCS/foo.h,v  -->  foo.h
+revision 1.1
+done
+""")
+
+
+
+#
+test.pass_test()
diff --git a/test/RCS/transparent.py b/test/RCS/transparent.py
new file mode 100644
index 0000000..63475c8
--- /dev/null
+++ b/test/RCS/transparent.py
@@ -0,0 +1,175 @@
+#!/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 transparent RCS checkouts from an RCS subdirectory.
+"""
+
+import os.path
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+rcs = test.where_is('rcs')
+if not rcs:
+    print "Could not find RCS, skipping test(s)."
+    test.pass_test(1)
+
+ci = test.where_is('ci')
+if not ci:
+    print "Could not find `ci' command, skipping test(s)."
+    test.pass_test(1)
+
+
+
+sub_RCS = os.path.join('sub', 'RCS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.subdir('RCS', 'sub', ['sub', 'RCS'])
+
+for f in ['aaa.in', 'bbb.in', 'ccc.in']:
+    test.write(f, "%s\n" % f)
+    args = "-f -t%s %s" % (f, f)
+    test.run(program = ci, arguments = args, stderr = None)
+
+for f in ['ddd.in', 'eee.in', 'fff.in']:
+    test.write(['sub', f], "sub/%s\n" % f)
+    args = "-f -tsub/%s sub/%s" % (f, f)
+    test.run(program = ci, arguments = args, stderr = None)
+
+test.write(['sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+args = "-f -tsub/SConscript sub/SConscript"
+test.run(program = ci, arguments = args, stderr = None)
+
+test.no_result(os.path.exists(test.workpath('aaa.in')))
+test.no_result(os.path.exists(test.workpath('bbb.in')))
+test.no_result(os.path.exists(test.workpath('ccc.in')))
+
+test.no_result(os.path.exists(test.workpath('sub', 'SConscript')))
+
+test.no_result(os.path.exists(test.workpath('sub', 'aaa.in')))
+test.no_result(os.path.exists(test.workpath('sub', 'bbb.in')))
+test.no_result(os.path.exists(test.workpath('sub', 'ccc.in')))
+
+test.write('SConstruct', """
+import os
+for key in ['LOGNAME', 'USERNAME', 'USER']:
+    logname = os.environ.get(key)
+    if logname: break
+ENV = {'PATH' : os.environ['PATH'],
+       'LOGNAME' : logname}
+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()
+DefaultEnvironment()['ENV'] = ENV
+DefaultEnvironment()['RCS_COFLAGS'] = '-l'
+env = Environment(ENV=ENV, BUILDERS={'Cat':Builder(action=cat)})
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+SConscript('sub/SConscript', "env")
+""")
+
+test.write('bbb.in', "checked-out bbb.in\n")
+
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+co -l %(sub_SConscript)s
+""" % locals(),
+                                   build_str = """\
+co -l aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+co -l ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+co -l %(sub_ddd_in)s
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+co -l %(sub_fff_in)s
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()),
+         stderr = """\
+%(sub_RCS)s/SConscript,v  -->  %(sub_SConscript)s
+revision 1.1 (locked)
+done
+RCS/aaa.in,v  -->  aaa.in
+revision 1.1 (locked)
+done
+RCS/ccc.in,v  -->  ccc.in
+revision 1.1 (locked)
+done
+%(sub_RCS)s/ddd.in,v  -->  %(sub_ddd_in)s
+revision 1.1 (locked)
+done
+%(sub_RCS)s/fff.in,v  -->  %(sub_fff_in)s
+revision 1.1 (locked)
+done
+""" % locals())
+
+# Checking things back out of RCS apparently messes with the line
+# endings, so read the result files in non-binary mode.
+
+test.must_match('all',
+                "aaa.in\nchecked-out bbb.in\nccc.in\n",
+                mode='r')
+
+test.must_match(['sub', 'all'],
+                "sub/ddd.in\nchecked-out sub/eee.in\nsub/fff.in\n",
+                mode='r')
+
+test.must_be_writable(test.workpath('sub', 'SConscript'))
+test.must_be_writable(test.workpath('aaa.in'))
+test.must_be_writable(test.workpath('ccc.in'))
+test.must_be_writable(test.workpath('sub', 'ddd.in'))
+test.must_be_writable(test.workpath('sub', 'fff.in'))
+
+
+
+#
+test.pass_test()
diff --git a/test/SCCS/SCCSCOM.py b/test/SCCS/SCCSCOM.py
new file mode 100644
index 0000000..1ba5782
--- /dev/null
+++ b/test/SCCS/SCCSCOM.py
@@ -0,0 +1,121 @@
+#!/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 setting the $SCCSCOM variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('SCCS', ['SCCS', 'sub'], 'sub')
+
+sub_SCCS = os.path.join('sub', 'SCCS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-sccs-get.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('SCCS/'+f, f)
+""")
+
+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(TOOLS = ['default', 'SCCS'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  SCCSCOM='%(python)s my-sccs-get.py $TARGET')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.SCCS())
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['SCCS', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['SCCS', 'aaa.in'], "SCCS/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['SCCS', 'ccc.in'], "SCCS/ccc.in\n")
+
+test.write(['SCCS', 'sub', 'ddd.in'], "SCCS/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['SCCS', 'sub', 'fff.in'], "SCCS/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+%(python)s my-sccs-get.py %(sub_SConscript)s
+""" % locals(),
+                                   build_str = """\
+%(python)s my-sccs-get.py aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+%(python)s my-sccs-get.py ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+%(python)s my-sccs-get.py %(sub_ddd_in)s
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+%(python)s my-sccs-get.py %(sub_fff_in)s
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "SCCS/aaa.in\nchecked-out bbb.in\nSCCS/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "SCCS/sub/ddd.in\nchecked-out sub/eee.in\nSCCS/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/SCCS/SCCSCOMSTR.py b/test/SCCS/SCCSCOMSTR.py
new file mode 100644
index 0000000..858e17b
--- /dev/null
+++ b/test/SCCS/SCCSCOMSTR.py
@@ -0,0 +1,122 @@
+#!/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 customizing the output with the the $SCCSCOMSTR variable.
+"""
+
+import os.path
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('SCCS', ['SCCS', 'sub'], 'sub')
+
+sub_SCCS = os.path.join('sub', 'SCCS')
+sub_SConscript = os.path.join('sub', 'SConscript')
+sub_all = os.path.join('sub', 'all')
+sub_ddd_in = os.path.join('sub', 'ddd.in')
+sub_ddd_out = os.path.join('sub', 'ddd.out')
+sub_eee_in = os.path.join('sub', 'eee.in')
+sub_eee_out = os.path.join('sub', 'eee.out')
+sub_fff_in = os.path.join('sub', 'fff.in')
+sub_fff_out = os.path.join('sub', 'fff.out')
+
+test.write('my-sccs-get.py', """
+import shutil
+import sys
+for f in sys.argv[1:]:
+    shutil.copy('SCCS/'+f, f)
+""")
+
+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(TOOLS = ['default', 'SCCS'],
+                  BUILDERS={'Cat':Builder(action=cat)},
+                  SCCSCOM='%(python)s my-sccs-get.py $TARGET',
+                  SCCSCOMSTR='Checking out $TARGET from our fake SCCS')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.SCCS())
+SConscript('sub/SConscript', "env")
+""" % locals())
+
+test.write(['SCCS', 'sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+
+test.write(['SCCS', 'aaa.in'], "SCCS/aaa.in\n")
+test.write('bbb.in', "checked-out bbb.in\n")
+test.write(['SCCS', 'ccc.in'], "SCCS/ccc.in\n")
+
+test.write(['SCCS', 'sub', 'ddd.in'], "SCCS/sub/ddd.in\n")
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+test.write(['SCCS', 'sub', 'fff.in'], "SCCS/sub/fff.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+Checking out %(sub_SConscript)s from our fake SCCS
+""" % locals(),
+                                   build_str = """\
+Checking out aaa.in from our fake SCCS
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+Checking out ccc.in from our fake SCCS
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+Checking out %(sub_ddd_in)s from our fake SCCS
+cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"])
+cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"])
+Checking out %(sub_fff_in)s from our fake SCCS
+cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"])
+cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"])
+""" % locals()))
+
+test.must_match('all',
+                "SCCS/aaa.in\nchecked-out bbb.in\nSCCS/ccc.in\n")
+
+test.must_match(['sub', 'all'],
+                "SCCS/sub/ddd.in\nchecked-out sub/eee.in\nSCCS/sub/fff.in\n")
+
+
+
+#
+test.pass_test()
diff --git a/test/SCCS/explicit.py b/test/SCCS/explicit.py
new file mode 100644
index 0000000..a501dda
--- /dev/null
+++ b/test/SCCS/explicit.py
@@ -0,0 +1,128 @@
+#!/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 explicit checkouts from local SCCS files.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+sccs = test.where_is('sccs')
+if not sccs:
+    print "Could not find SCCS, skipping test(s)."
+    test.pass_test(1)
+
+
+
+test.subdir('sub')
+
+for f in ['aaa.in', 'bbb.in', 'ccc.in']:
+    test.write(f, "%s\n" % f)
+    args = "create %s" % f
+    test.run(program = sccs, arguments = args, stderr = None)
+    test.unlink(f)
+    test.unlink(','+f)
+
+test.write(['sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+args = "create SConscript"
+test.run(chdir = 'sub', program = sccs, arguments = args, stderr = None)
+test.unlink(['sub', 'SConscript'])
+test.unlink(['sub', ',SConscript'])
+
+for f in ['ddd.in', 'eee.in', 'fff.in']:
+    test.write(['sub', f], "sub/%s\n" % f)
+    args = "create %s" % f
+    test.run(chdir = 'sub', program = sccs, arguments = args, stderr = None)
+    test.unlink(['sub', f])
+    test.unlink(['sub', ','+f])
+
+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)},
+                  SCCSGETFLAGS='-e')
+env.Cat('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+env.SourceCode('.', env.SCCS())
+SConscript('sub/SConscript', "env")
+""")
+
+test.write('bbb.in', "checked-out bbb.in\n")
+
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+sccs get -e sub/SConscript
+""",
+                                   build_str = """\
+sccs get -e aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+sccs get -e ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+sccs get -e sub/ddd.in
+cat(["sub/ddd.out"], ["sub/ddd.in"])
+cat(["sub/eee.out"], ["sub/eee.in"])
+sccs get -e sub/fff.in
+cat(["sub/fff.out"], ["sub/fff.in"])
+cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"])
+"""),
+         stderr = """\
+sub/SConscript 1.1 -> 1.2: 5 lines
+aaa.in 1.1 -> 1.2: 1 lines
+ccc.in 1.1 -> 1.2: 1 lines
+sub/ddd.in 1.1 -> 1.2: 1 lines
+sub/fff.in 1.1 -> 1.2: 1 lines
+""")
+
+test.must_match('all', "aaa.in\nchecked-out bbb.in\nccc.in\n")
+
+test.must_be_writable(test.workpath('sub', 'SConscript'))
+test.must_be_writable(test.workpath('aaa.in'))
+test.must_be_writable(test.workpath('ccc.in'))
+test.must_be_writable(test.workpath('sub', 'ddd.in'))
+test.must_be_writable(test.workpath('sub', 'fff.in'))
+
+
+
+test.pass_test()
diff --git a/test/SCCS/implicit.py b/test/SCCS/implicit.py
new file mode 100644
index 0000000..a8e6568
--- /dev/null
+++ b/test/SCCS/implicit.py
@@ -0,0 +1,75 @@
+#!/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 transparent SCCS checkouts of implicit dependencies.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+sccs = test.where_is('sccs')
+if not sccs:
+    print "Could not find SCCS, skipping test(s)."
+    test.pass_test(1)
+
+
+
+test.subdir('SCCS')
+
+test.write('foo.c', """\
+#include "foo.h"
+int
+main(int argc, char *argv[]) {
+    printf(STR);
+    printf("foo.c\\n");
+}
+""")
+test.run(program = sccs, arguments = "create foo.c", stderr = None)
+test.unlink('foo.c')
+test.unlink(',foo.c')
+
+test.write('foo.h', """\
+#define STR     "foo.h\\n"
+""")
+test.run(program = sccs, arguments = "create foo.h", stderr = None)
+test.unlink('foo.h')
+test.unlink(',foo.h')
+
+test.write('SConstruct', """
+env = Environment()
+env.Program('foo.c')
+""")
+
+test.run(stderr = """\
+foo.c 1.1: 6 lines
+foo.h 1.1: 1 lines
+""")
+
+
+
+test.pass_test()
diff --git a/test/SCCS/transparent.py b/test/SCCS/transparent.py
new file mode 100644
index 0000000..e873051
--- /dev/null
+++ b/test/SCCS/transparent.py
@@ -0,0 +1,126 @@
+#!/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 transparent checkouts from SCCS files in an SCCS subdirectory.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+sccs = test.where_is('sccs')
+if not sccs:
+    print "Could not find SCCS, skipping test(s)."
+    test.pass_test(1)
+
+
+
+test.subdir('SCCS', 'sub', ['sub', 'SCCS'])
+
+for f in ['aaa.in', 'bbb.in', 'ccc.in']:
+    test.write(f, "%s\n" % f)
+    args = "create %s" % f
+    test.run(program = sccs, arguments = args, stderr = None)
+    test.unlink(f)
+    test.unlink(','+f)
+
+test.write(['sub', 'SConscript'], """\
+Import("env")
+env.Cat('ddd.out', 'ddd.in')
+env.Cat('eee.out', 'eee.in')
+env.Cat('fff.out', 'fff.in')
+env.Cat('all', ['ddd.out', 'eee.out', 'fff.out'])
+""")
+args = "create SConscript"
+test.run(chdir = 'sub', program = sccs, arguments = args, stderr = None)
+test.unlink(['sub', 'SConscript'])
+test.unlink(['sub', ',SConscript'])
+
+for f in ['ddd.in', 'eee.in', 'fff.in']:
+    test.write(['sub', f], "sub/%s\n" % f)
+    args = "create %s" % f
+    test.run(chdir = 'sub', program = sccs, arguments = args, stderr = None)
+    test.unlink(['sub', f])
+    test.unlink(['sub', ','+f])
+
+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('aaa.out', 'aaa.in')
+env.Cat('bbb.out', 'bbb.in')
+env.Cat('ccc.out', 'ccc.in')
+env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
+SConscript('sub/SConscript', "env")
+""")
+
+test.write(['bbb.in'], "checked-out bbb.in\n")
+
+test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
+
+test.run(arguments = '.',
+         stdout = test.wrap_stdout(read_str = """\
+sccs get sub/SConscript
+""",
+                                   build_str = """\
+sccs get aaa.in
+cat(["aaa.out"], ["aaa.in"])
+cat(["bbb.out"], ["bbb.in"])
+sccs get ccc.in
+cat(["ccc.out"], ["ccc.in"])
+cat(["all"], ["aaa.out", "bbb.out", "ccc.out"])
+sccs get sub/ddd.in
+cat(["sub/ddd.out"], ["sub/ddd.in"])
+cat(["sub/eee.out"], ["sub/eee.in"])
+sccs get sub/fff.in
+cat(["sub/fff.out"], ["sub/fff.in"])
+cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"])
+"""),
+         stderr = """\
+sub/SConscript 1.1: 5 lines
+aaa.in 1.1: 1 lines
+ccc.in 1.1: 1 lines
+sub/ddd.in 1.1: 1 lines
+sub/fff.in 1.1: 1 lines
+""")
+
+test.must_match('all', "aaa.in\nchecked-out bbb.in\nccc.in\n")
+
+test.must_not_be_writable(test.workpath('sub', 'SConscript'))
+test.must_not_be_writable(test.workpath('aaa.in'))
+test.must_not_be_writable(test.workpath('ccc.in'))
+test.must_not_be_writable(test.workpath('sub', 'ddd.in'))
+test.must_not_be_writable(test.workpath('sub', 'fff.in'))
+
+
+
+test.pass_test()