Make SConsignFile() behavior the default.

4 files changed, 921 insertions, 0 deletions

diff --git a/test/sconsign/corrupt.py b/test/sconsign/corrupt.py
new file mode 100644
index 00000000..fd46de47
--- /dev/null
+++ b/test/sconsign/corrupt.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test that we get proper warnings when .sconsign* files are corrupt.
+"""
+
+import os
+import TestSCons
+import TestCmd
+import cPickle
+
+test = TestSCons.TestSCons(match = TestCmd.match_re)
+
+test.subdir('work1', ['work1', 'sub'],
+            'work2', ['work2', 'sub'])
+
+work1__sconsign_dblite = test.workpath('work1', '.sconsign.dblite')
+work2_sub__sconsign = test.workpath('work2', 'sub', '.sconsign')
+
+SConstruct_contents = """\
+def build1(target, source, env):
+    open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
+    return None
+
+B1 = Builder(action = build1)
+env = Environment(BUILDERS = { 'B1' : B1})
+env.B1(target = 'sub/foo.out', source = 'foo.in')
+"""
+
+
+
+test.write(['work1', 'SConstruct'], SConstruct_contents)
+
+test.write(['work1', 'foo.in'], "work1/foo.in\n")
+
+stderr = '''
+scons: warning: Ignoring corrupt .sconsign file: \.sconsign\.dblite
+.*
+'''
+
+stdout = test.wrap_stdout('build1\(\["sub.foo\.out"\], \["foo\.in"\]\)\n')
+
+test.write(work1__sconsign_dblite, 'not:a:sconsign:file')
+test.run(chdir='work1', arguments='.', stderr=stderr, stdout=stdout)
+
+test.write(work1__sconsign_dblite, '\0\0\0\0\0\0\0\0\0\0\0\0\0\0')
+test.run(chdir='work1', arguments='.', stderr=stderr, stdout=stdout)
+
+
+
+# Test explicitly using a .sconsign file in each directory.
+
+SConstruct_contents = """\
+SConsignFile(None)
+""" + SConstruct_contents
+
+test.write(['work2', 'SConstruct'], SConstruct_contents)
+
+test.write(['work2', 'foo.in'], "work2/foo.in\n")
+
+stderr = '''
+scons: warning: Ignoring corrupt .sconsign file: sub.\.sconsign
+.*
+'''
+
+stdout = test.wrap_stdout('build1\(\["sub.foo\.out"\], \["foo\.in"\]\)\n')
+
+test.write(work2_sub__sconsign, 'not:a:sconsign:file')
+test.run(chdir='work2', arguments='.', stderr=stderr, stdout=stdout)
+
+test.write(work2_sub__sconsign, '\0\0\0\0\0\0\0\0\0\0\0\0\0\0')
+test.run(chdir='work2', arguments='.', stderr=stderr, stdout=stdout)
+
+
+
+test.pass_test()
diff --git a/test/sconsign/nonwritable.py b/test/sconsign/nonwritable.py
new file mode 100644
index 00000000..9ad679cf
--- /dev/null
+++ b/test/sconsign/nonwritable.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test that things still work when a .sconsign* file is not writable.
+"""
+
+import os
+import TestSCons
+import TestCmd
+import cPickle
+
+test = TestSCons.TestSCons(match = TestCmd.match_re)
+
+test.subdir('work1',
+            ['work1', 'sub1'],
+            ['work1', 'sub2'],
+            ['work1', 'sub3'],
+            'work2',
+            ['work2', 'sub1'],
+            ['work2', 'sub2'],
+            ['work2', 'sub3'])
+
+work1__sconsign_dblite = test.workpath('work1', '.sconsign.dblite')
+work2_sub1__sconsign = test.workpath('work2', 'sub1', '.sconsign')
+work2_sub2__sconsign = test.workpath('work2', 'sub2', '.sconsign')
+work2_sub3__sconsign = test.workpath('work2', 'sub3', '.sconsign')
+
+SConstruct_contents = """\
+def build1(target, source, env):
+    open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
+    return None
+
+def build2(target, source, env):
+    import os
+    import os.path
+    open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
+    dir, file = os.path.split(str(target[0]))
+    os.chmod(dir, 0555)
+    return None
+
+B1 = Builder(action = build1)
+B2 = Builder(action = build2)
+env = Environment(BUILDERS = { 'B1' : B1, 'B2' : B2 })
+env.B1(target = 'sub1/foo.out', source = 'foo.in')
+env.B2(target = 'sub2/foo.out', source = 'foo.in')
+env.B2(target = 'sub3/foo.out', source = 'foo.in')
+"""
+
+
+
+test.write(['work1', 'SConstruct'], SConstruct_contents)
+
+test.write(['work1', 'foo.in'], "work1/foo.in\n")
+
+test.write(work1__sconsign_dblite, "")
+
+os.chmod(work1__sconsign_dblite, 0444)
+
+test.run(chdir='work1', arguments='.')
+
+
+
+SConstruct_contents = """\
+SConsignFile(None)
+""" + SConstruct_contents
+
+test.write(['work2', 'SConstruct'], SConstruct_contents)
+
+test.write(['work2', 'foo.in'], "work2/foo.in\n")
+
+cPickle.dump({}, open(work2_sub1__sconsign, 'wb'), 1)
+cPickle.dump({}, open(work2_sub2__sconsign, 'wb'), 1)
+
+os.chmod(work2_sub1__sconsign, 0444)
+
+test.run(chdir='work2', arguments='.')
+
+
+
+test.pass_test()
diff --git a/test/sconsign/old.py b/test/sconsign/old.py
new file mode 100644
index 00000000..703a924c
--- /dev/null
+++ b/test/sconsign/old.py
@@ -0,0 +1,197 @@
+#!/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 the transition from the old .sconsign format(s).
+"""
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('src1', ['src1', 'subdir'],
+            'src2', ['src2', 'subdir'])
+
+convert = test.workpath('convert.py')
+convert_dblite = test.workpath('convert_dblite.py')
+
+test.write(convert, """\
+import cPickle
+import sys
+import SCons.SConsign
+import SCons.Sig
+
+try:
+    SConsignEntry = SCons.Sig.SConsignEntry
+except AttributeError:
+    class SConsignEntry:
+        timestamp = None
+        bsig = None
+        csig = None
+        implicit = None
+
+filename = sys.argv[1]
+
+sconsign = SCons.SConsign.Dir(open(filename, 'rb'))
+
+old_entries = {}
+for name, entry in sconsign.entries.items():
+    oe = SConsignEntry()
+    for attr in ['timestamp', 'bsig', 'csig', 'implicit']:
+        try: setattr(oe, attr, getattr(entry, attr))
+        except AttributeError: pass
+    old_entries[name] = oe
+
+cPickle.dump(old_entries, open(filename, 'wb'), 1)
+""")
+
+test.write(convert_dblite, """\
+import cPickle
+import SCons.dblite
+import sys
+import SCons.SConsign
+import SCons.Sig
+
+try:
+    SConsignEntry = SCons.Sig.SConsignEntry
+except AttributeError:
+    class SConsignEntry:
+        timestamp = None
+        bsig = None
+        csig = None
+        implicit = None
+
+filename = sys.argv[1]
+
+db = SCons.dblite.open(filename, "r")
+
+old_db = {}
+for dir in db.keys():
+    #self.printentries(dir, db[dir])
+
+    new_entries = cPickle.loads(db[dir])
+    old_db[dir] = old_entries = {}
+    for name, entry in new_entries.items():
+        oe = SConsignEntry()
+        for attr in ['timestamp', 'bsig', 'csig', 'implicit']:
+            try: setattr(oe, attr, getattr(entry, attr))
+            except AttributeError: pass
+        old_entries[name] = oe
+
+db = SCons.dblite.open(filename, "c")
+for key, val in old_db.items():
+    db[key] = cPickle.dumps(val)
+db.sync()
+""")
+
+
+
+# Now generate a simple .sconsign file for a simple build.
+test.write(['src1', 'SConstruct'], """\
+SConsignFile(None)
+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.Append(BUILDERS={'Cat':Builder(action=cat)})
+
+Export("env")
+SConscript('SConscript')
+""")
+
+test.write(['src1', 'SConscript'], """\
+Import("env")
+env.Cat('file1', 'file1.in')
+env.Cat('subdir/file2', 'subdir/file2.in')
+""")
+
+test.write(['src1', 'file1.in'], "file1.in 1\n")
+test.write(['src1', 'subdir', 'file2.in'], "subdir/file2.in 1\n")
+
+test.run(chdir='src1', arguments='.')
+
+test.up_to_date(chdir='src1', arguments='.')
+
+sconsign_list = [
+        test.workpath('src1', '.sconsign'),
+        test.workpath('src1', 'subdir', '.sconsign'),
+]
+
+for sconsign in sconsign_list:
+    test.run(interpreter=python, program=convert, arguments=sconsign)
+
+test.up_to_date(chdir='src1', arguments='.')
+
+
+
+# Now do the same with SConsignFile().
+test.write(['src2', '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.Append(BUILDERS={'Cat':Builder(action=cat)})
+env.Cat('file1', 'file1.in')
+env.Cat('subdir/file2', 'subdir/file2.in')
+""")
+
+test.write(['src2', 'file1.in'], "file1.in 1\n")
+test.write(['src2', 'subdir', 'file2.in'], "subdir/file2.in 1\n")
+
+test.run(chdir='src2', arguments='.')
+
+test.up_to_date(chdir='src2', arguments='.')
+
+sconsign_list = [
+        test.workpath('src2', '.sconsign'),
+]
+
+for sconsign in sconsign_list:
+    test.run(interpreter=python, program=convert_dblite, arguments=sconsign)
+
+test.up_to_date(chdir='src2', arguments='.')
+
+
+
+test.pass_test()
diff --git a/test/sconsign/script.py b/test/sconsign/script.py
new file mode 100644
index 00000000..9758d5a3
--- /dev/null
+++ b/test/sconsign/script.py
@@ -0,0 +1,520 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os.path
+import string
+import time
+
+import TestCmd
+import TestSCons
+
+# Check for the sconsign script before we instantiate TestSCons(),
+# because that will change directory on us.
+if os.path.exists('sconsign.py'):
+    sconsign = 'sconsign.py'
+elif os.path.exists('sconsign'):
+    sconsign = 'sconsign'
+else:
+    print "Can find neither 'sconsign.py' nor 'sconsign' scripts."
+    test.no_result(1)
+
+def sort_match(test, lines, expect):
+    lines = string.split(lines, '\n')
+    lines.sort()
+    expect = string.split(expect, '\n')
+    expect.sort()
+    return test.match_re(lines, expect)
+
+def re_sep(*args):
+    return string.replace(apply(os.path.join, args), '\\', '\\\\')
+
+
+
+class MyTestSCons(TestSCons.TestSCons):
+    # subclass with a method for running the sconsign script
+    def __init__(self, *args, **kw):
+	apply(TestSCons.TestSCons.__init__, (self,)+args, kw)
+	self.my_kw = {
+            'interpreter' : TestSCons.python,
+	    'program' : sconsign,
+	}
+    def run_sconsign(self, *args, **kw):
+        kw.update(self.my_kw)
+        return apply(self.run, args, kw)
+
+test = MyTestSCons(match = TestCmd.match_re)
+
+
+
+
+test.subdir('work1', ['work1', 'sub1'], ['work1', 'sub2'],
+            'work2', ['work2', 'sub1'], ['work2', 'sub2'])
+
+test.write(['work1', 'SConstruct'], """
+SConsignFile(None)
+env1 = Environment(PROGSUFFIX = '.exe', OBJSUFFIX = '.obj')
+env1.Program('sub1/hello.c')
+env2 = env1.Copy(CPPPATH = ['sub2'])
+env2.Program('sub2/hello.c')
+""")
+
+test.write(['work1', 'sub1', 'hello.c'], r"""\
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("sub1/hello.c\n");
+	exit (0);
+}
+""")
+
+test.write(['work1', 'sub2', 'hello.c'], r"""\
+#include <inc1.h>
+#include <inc2.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("sub2/goodbye.c\n");
+	exit (0);
+}
+""")
+
+test.write(['work1', 'sub2', 'inc1.h'], r"""\
+#define STRING1 "inc1.h"
+""")
+
+test.write(['work1', 'sub2', 'inc2.h'], r"""\
+#define STRING2 "inc2.h"
+""")
+
+test.run(chdir = 'work1', arguments = '--debug=stacktrace --implicit-cache .')
+
+test.run_sconsign(arguments = "work1/sub1/.sconsign",
+         stdout = """\
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-v work1/sub1/.sconsign",
+         stdout = """\
+hello.exe:
+    timestamp: None
+    bsig: \S+
+    csig: None
+    implicit:
+        hello.obj: \S+
+hello.obj:
+    timestamp: None
+    bsig: \S+
+    csig: None
+    implicit:
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-b -v work1/sub1/.sconsign",
+         stdout = """\
+hello.exe:
+    bsig: \S+
+hello.obj:
+    bsig: \S+
+""")
+
+test.run_sconsign(arguments = "-c -v work1/sub1/.sconsign",
+         stdout = """\
+hello.exe:
+    csig: None
+hello.obj:
+    csig: None
+""")
+
+test.run_sconsign(arguments = "-e hello.obj work1/sub1/.sconsign",
+         stdout = """\
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.obj -e hello.exe -e hello.obj work1/sub1/.sconsign",
+         stdout = """\
+hello.obj: None \S+ None
+        hello.c: \S+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+# XXX NOT SURE IF THIS IS RIGHT!
+sub2_inc1_h = re_sep('sub2', 'inc1.h')
+sub2_inc2_h = re_sep('sub2', 'inc2.h')
+
+test.run_sconsign(arguments = "work1/sub2/.sconsign",
+         stdout = """\
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run_sconsign(arguments = "-i -v work1/sub2/.sconsign",
+         stdout = """\
+hello.exe:
+    implicit:
+        hello.obj: \S+
+hello.obj:
+    implicit:
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.obj work1/sub2/.sconsign work1/sub1/.sconsign",
+         stdout = """\
+hello.obj: None \S+ None
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run(chdir = 'work1', arguments = '--clean .')
+
+test.write(['work1', 'SConstruct'], """
+SourceSignatures('timestamp')
+TargetSignatures('content')
+env1 = Environment(PROGSUFFIX = '.exe', OBJSUFFIX = '.obj')
+env1.Program('sub1/hello.c')
+env2 = env1.Copy(CPPPATH = ['sub2'])
+env2.Program('sub2/hello.c')
+""")
+
+time.sleep(1)
+
+test.run(chdir = 'work1', arguments = '. --max-drift=1 --debug=stacktrace')
+
+test.run_sconsign(arguments = "-e hello.exe -e hello.obj work1/sub1/.sconsign",
+         stdout = """\
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.exe -e hello.obj -r work1/sub1/.sconsign",
+         stdout = """\
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+
+##############################################################################
+
+test.write(['work2', 'SConstruct'], """
+SConsignFile()
+env1 = Environment(PROGSUFFIX = '.exe', OBJSUFFIX = '.obj')
+env1.Program('sub1/hello.c')
+env2 = env1.Copy(CPPPATH = ['sub2'])
+env2.Program('sub2/hello.c')
+""")
+
+test.write(['work2', 'sub1', 'hello.c'], r"""\
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("sub1/hello.c\n");
+	exit (0);
+}
+""")
+
+test.write(['work2', 'sub2', 'hello.c'], r"""\
+#include <inc1.h>
+#include <inc2.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("sub2/goodbye.c\n");
+	exit (0);
+}
+""")
+
+test.write(['work2', 'sub2', 'inc1.h'], r"""\
+#define STRING1 "inc1.h"
+""")
+
+test.write(['work2', 'sub2', 'inc2.h'], r"""\
+#define STRING2 "inc2.h"
+""")
+
+test.run(chdir = 'work2', arguments = '--implicit-cache .')
+
+test.run_sconsign(arguments = "work2/.sconsign")
+
+test.run_sconsign(arguments = "work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+=== sub2:
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run_sconsign(arguments = "-v work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.exe:
+    timestamp: None
+    bsig: \S+
+    csig: None
+    implicit:
+        hello.obj: \S+
+hello.obj:
+    timestamp: None
+    bsig: \S+
+    csig: None
+    implicit:
+        hello.c: \S+
+=== sub2:
+hello.exe:
+    timestamp: None
+    bsig: \S+
+    csig: None
+    implicit:
+        hello.obj: \S+
+hello.obj:
+    timestamp: None
+    bsig: \S+
+    csig: None
+    implicit:
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run_sconsign(arguments = "-b -v work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.exe:
+    bsig: \S+
+hello.obj:
+    bsig: \S+
+=== sub2:
+hello.exe:
+    bsig: \S+
+hello.obj:
+    bsig: \S+
+""")
+
+test.run_sconsign(arguments = "-c -v work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.exe:
+    csig: None
+hello.obj:
+    csig: None
+=== sub2:
+hello.exe:
+    csig: None
+hello.obj:
+    csig: None
+""")
+
+test.run_sconsign(arguments = "-e hello.obj work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.obj: None \S+ None
+        hello.c: \S+
+=== sub2:
+hello.obj: None \S+ None
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.obj -e hello.exe -e hello.obj work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.obj: None \S+ None
+        hello.c: \S+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+=== sub2:
+hello.obj: None \S+ None
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run_sconsign(arguments = "-i -v work2/.sconsign",
+         stdout = """\
+=== sub1:
+hello.exe:
+    implicit:
+        hello.obj: \S+
+hello.obj:
+    implicit:
+        hello.c: \S+
+=== sub2:
+hello.exe:
+    implicit:
+        hello.obj: \S+
+hello.obj:
+    implicit:
+        hello.c: \S+
+        inc1.h: \S+
+        inc2.h: \S+
+""")
+
+test.run(chdir = 'work2', arguments = '--clean .')
+
+test.write(['work2','SConstruct'], """
+SConsignFile('my_sconsign')
+SourceSignatures('timestamp')
+TargetSignatures('content')
+env1 = Environment(PROGSUFFIX = '.exe', OBJSUFFIX = '.obj')
+env1.Program('sub1/hello.c')
+env2 = env1.Copy(CPPPATH = ['sub2'])
+env2.Program('sub2/hello.c')
+""")
+
+time.sleep(1)
+
+test.run(chdir = 'work2', arguments = '. --max-drift=1')
+
+expect = """\
+=== sub1:
+hello.c: \d+ None \d+
+"""
+
+test.run_sconsign(arguments = "-e hello.exe -e hello.obj -d sub1 -f dblite work2/my_sconsign",
+         stdout = """\
+=== sub1:
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.exe -e hello.obj -d sub1 -f dblite work2/my_sconsign.dblite",
+         stdout = """\
+=== sub1:
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.c -e hello.exe -e hello.obj -d sub1 -f dblite work2/my_sconsign",
+         stdout = """\
+=== sub1:
+hello.c: \d+ None \d+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.c -e hello.exe -e hello.obj -d sub1 -f dblite work2/my_sconsign.dblite",
+         stdout = """\
+=== sub1:
+hello.c: \d+ None \d+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.c -e hello.exe -e hello.obj -r -d sub1 -f dblite work2/my_sconsign",
+         stdout = """\
+=== sub1:
+hello.c: '\S+ \S+ [ \d]\d \d\d:\d\d:\d\d \d\d\d\d' None \d+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+test.run_sconsign(arguments = "-e hello.c -e hello.exe -e hello.obj -r -d sub1 -f dblite work2/my_sconsign.dblite",
+         stdout = """\
+=== sub1:
+hello.c: '\S+ \S+ [ \d]\d \d\d:\d\d:\d\d \d\d\d\d' None \d+
+hello.exe: None \S+ None
+        hello.obj: \S+
+hello.obj: None \S+ None
+        hello.c: \S+
+""")
+
+##############################################################################
+
+test.write('bad1', "bad1\n")
+test.write('bad2.dblite', "bad2.dblite\n")
+test.write('bad3', "bad3\n")
+
+test.run_sconsign(arguments = "-f dblite no_sconsign",
+         stderr = "sconsign: \[Errno 2\] No such file or directory: 'no_sconsign'\n")
+
+test.run_sconsign(arguments = "-f dblite bad1",
+         stderr = "sconsign: \[Errno 2\] No such file or directory: 'bad1.dblite'\n")
+
+test.run_sconsign(arguments = "-f dblite bad1.dblite",
+         stderr = "sconsign: \[Errno 2\] No such file or directory: 'bad1.dblite'\n")
+
+test.run_sconsign(arguments = "-f dblite bad2",
+         stderr = "sconsign: ignoring invalid `dblite' file `bad2'\n")
+
+test.run_sconsign(arguments = "-f dblite bad2.dblite",
+         stderr = "sconsign: ignoring invalid `dblite' file `bad2.dblite'\n")
+
+test.run_sconsign(arguments = "-f sconsign no_sconsign",
+         stderr = "sconsign: \[Errno 2\] No such file or directory: 'no_sconsign'\n")
+
+test.run_sconsign(arguments = "-f sconsign bad3",
+         stderr = "sconsign: ignoring invalid .sconsign file `bad3'\n")
+
+test.pass_test()