Check out files from various source code systems properly.

1 files changed, 233 insertions, 83 deletions

diff --git a/test/BitKeeper.py b/test/BitKeeper.py
index 0926b28..eb5c52c 100644
--- a/test/BitKeeper.py
+++ b/test/BitKeeper.py
@@ -29,6 +29,7 @@ Test fetching source files from BitKeeper.
 """
 
 import os
+import stat
 
 import TestSCons
 
@@ -39,6 +40,10 @@ if not bk:
     print "Could not find BitKeeper, skipping test(s)."
     test.pass_test(1)
 
+def is_writable(file):
+    mode = os.stat(file)[stat.ST_MODE]
+    return mode & stat.S_IWUSR
+
 try:
     login = os.getlogin()
 except AttributeError:
@@ -51,16 +56,202 @@ host = os.uname()[1]
 
 email = "%s@%s" % (login, host)
 
-test.subdir('BitKeeper', 'import', ['import', 'sub'], 'work1', 'work2')
+test.subdir('BK', 'import', ['import', 'sub'])
 
-# Set up the BitKeeper repository.
-bkroot = test.workpath('BitKeeper')
-bk_conf = test.workpath('bk.conf')
+# 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.fail_test(test.read(['work1', 'all']) != "work1/aaa.in\nchecked-out work1/bbb.in\nwork1/ccc.in\n")
+
+    test.fail_test(not is_writable(test.workpath('work1', 'sub', 'SConscript')))
+    test.fail_test(not is_writable(test.workpath('work1', 'aaa.in')))
+    test.fail_test(not is_writable(test.workpath('work1', 'ccc.in')))
+    test.fail_test(not is_writable(test.workpath('work1', 'sub', 'ddd.in')))
+    test.fail_test(not is_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.fail_test(test.read(['work2', 'all']) != "work2/aaa.in\nchecked-out work2/bbb.in\nwork2/ccc.in\n")
+
+    test.fail_test(test.read(['work2', 'sub', 'all']) != "work2/sub/ddd.in\nchecked-out work2/sub/eee.in\nwork2/sub/fff.in\n")
+
+    test.fail_test(is_writable(test.workpath('work2', 'sub', 'SConscript')))
+    test.fail_test(is_writable(test.workpath('work2', 'aaa.in')))
+    test.fail_test(is_writable(test.workpath('work2', 'ccc.in')))
+    test.fail_test(is_writable(test.workpath('work2', 'sub', 'ddd.in')))
+    test.fail_test(is_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, """\
+test.write('bk.conf', """\
 description:test project 'foo'
 logging:none
 email:%s
@@ -72,10 +263,6 @@ single_host:%s
 # shut up and not prompt us to accept the license.
 os.environ['BK_LICENSE'] = 'ACCEPTED'
 
-test.run(chdir = bkroot,
-         program = bk,
-         arguments = 'setup -f -c %s foo' % bk_conf)
-
 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")
@@ -92,12 +279,18 @@ 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/foo' % bkroot)
+         arguments = 'import -q -f -tplain . %s' % test.workpath('work3'))
 
-# Test the most straightforward BitKeeper checkouts, using the module name.
-test.write(['work1', 'SConstruct'], """
+test.write(['work3', 'SConstruct'], """
 def cat(env, source, target):
     target = str(target[0])
     source = map(str, source)
@@ -105,98 +298,55 @@ def cat(env, source, target):
     for src in source:
         f.write(open(src, "rb").read())
     f.close()
+_default_env['SCCS'] = r'%s'
 env = Environment(BUILDERS={'Cat':Builder(action=cat)})
-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.BitKeeper(r'%s'))
-SConscript('foo/sub/SConscript', "env")
-""" % bkroot)
-
-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 = """\
-bk get -p %s/foo/sub/SConscript > foo/sub/SConscript
-""" % (bkroot),
-                                   build_str = """\
-bk get -p %s/foo/aaa.in > foo/aaa.in
-cat("aaa.out", "foo/aaa.in")
-cat("bbb.out", "foo/bbb.in")
-bk get -p %s/foo/ccc.in > foo/ccc.in
-cat("ccc.out", "foo/ccc.in")
-cat("all", ["aaa.out", "bbb.out", "ccc.out"])
-bk get -p %s/foo/sub/ddd.in > foo/sub/ddd.in
-cat("foo/sub/ddd.out", "foo/sub/ddd.in")
-cat("foo/sub/eee.out", "foo/sub/eee.in")
-bk get -p %s/foo/sub/fff.in > foo/sub/fff.in
-cat("foo/sub/fff.out", "foo/sub/fff.in")
-cat("foo/sub/all", ["foo/sub/ddd.out", "foo/sub/eee.out", "foo/sub/fff.out"])
-""" % (bkroot, bkroot, bkroot, bkroot)),
-         stderr = """\
-%s/foo/sub/SConscript 1.1: 5 lines
-%s/foo/aaa.in 1.1: 1 lines
-%s/foo/ccc.in 1.1: 1 lines
-%s/foo/sub/ddd.in 1.1: 1 lines
-%s/foo/sub/fff.in 1.1: 1 lines
-""" % (bkroot, bkroot, bkroot, bkroot, bkroot))
-
-test.fail_test(test.read(['work1', 'all']) != "import/aaa.in\nwork1/foo/bbb.in\nimport/ccc.in\n")
-
-test.fail_test(test.read(['work1', 'foo', 'sub', 'all']) != "import/sub/ddd.in\nwork1/foo/sub/eee.in\nimport/sub/fff.in\n")
-
-# Test BitKeeper checkouts when the module name is specified.
-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)},
-                  BITKEEPERFLAGS='-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(r'%s', 'foo'))
 SConscript('sub/SConscript', "env")
-""" % bkroot)
+""" % bk)
 
-test.write(['work2', 'bbb.in'], "work2/bbb.in\n")
+test.write(['work3', 'bbb.in'], "work3/bbb.in\n")
 
-test.subdir(['work2', 'sub'])
-test.write(['work2', 'sub', 'eee.in'], "work2/sub/eee.in\n")
+test.subdir(['work3', 'sub'])
+test.write(['work3', 'sub', 'eee.in'], "work3/sub/eee.in\n")
 
-test.run(chdir = 'work2',
+test.run(chdir = 'work3',
          arguments = '.',
          stdout = test.wrap_stdout(read_str = """\
-bk get -q -p %s/foo/sub/SConscript > sub/SConscript
-""" % (bkroot),
+%s get sub/SConscript
+""" % bk,
                                    build_str = """\
-bk get -q -p %s/foo/aaa.in > aaa.in
+%s get aaa.in
 cat("aaa.out", "aaa.in")
 cat("bbb.out", "bbb.in")
-bk get -q -p %s/foo/ccc.in > ccc.in
+%s get ccc.in
 cat("ccc.out", "ccc.in")
 cat("all", ["aaa.out", "bbb.out", "ccc.out"])
-bk get -q -p %s/foo/sub/ddd.in > sub/ddd.in
+%s get sub/ddd.in
 cat("sub/ddd.out", "sub/ddd.in")
 cat("sub/eee.out", "sub/eee.in")
-bk get -q -p %s/foo/sub/fff.in > sub/fff.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"])
-""" % (bkroot, bkroot, bkroot, bkroot)))
+""" % (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.fail_test(test.read(['work3', 'all']) != "import/aaa.in\nwork3/bbb.in\nimport/ccc.in\n")
 
-test.fail_test(test.read(['work2', 'all']) != "import/aaa.in\nwork2/bbb.in\nimport/ccc.in\n")
+test.fail_test(test.read(['work3', 'sub', 'all']) != "import/sub/ddd.in\nwork3/sub/eee.in\nimport/sub/fff.in\n")
 
-test.fail_test(test.read(['work2', 'sub', 'all']) != "import/sub/ddd.in\nwork2/sub/eee.in\nimport/sub/fff.in\n")
+test.fail_test(is_writable(test.workpath('work3', 'sub', 'SConscript')))
+test.fail_test(is_writable(test.workpath('work3', 'aaa.in')))
+test.fail_test(is_writable(test.workpath('work3', 'ccc.in')))
+test.fail_test(is_writable(test.workpath('work3', 'sub', 'ddd.in')))
+test.fail_test(is_writable(test.workpath('work3', 'sub', 'fff.in')))
 
 test.pass_test()