2 files changed, 249 insertions, 0 deletions
diff --git a/test/Repository/signature-order.py b/test/Repository/signature-order.py
new file mode 100644
index 0000000..2329569
--- /dev/null
+++ b/test/Repository/signature-order.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__"
+
+"""
+Verify that we don't rebuild things unnecessarily when the order of
+signatures changes because an included file shifts from the local sandbox
+to a Repository and vice versa.
+"""
+
+import sys
+import TestSCons
+
+_exe = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+test.subdir('repository', 'work')
+
+repository = test.workpath('repository')
+work_foo = test.workpath('work', 'foo' + _exe)
+work_foo_h = test.workpath('work', 'foo.h')
+
+test.write(['work', 'SConstruct'], """
+Repository(r'%s')
+env = Environment(CPPPATH = ['.'])
+env.Program(target = 'foo', source = 'foo.c')
+""" % repository)
+
+foo_h_contents = """\
+#define	STRING1	"foo.h"
+"""
+
+bar_h_contents = """\
+#define	STRING2	"bar.h"
+"""
+
+test.write(['repository', 'foo.h'], foo_h_contents)
+
+test.write(['repository', 'bar.h'], bar_h_contents)
+
+test.write(['repository', 'foo.c'], r"""
+#include <foo.h>
+#include <bar.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("%s\n", STRING1);
+	printf("%s\n", STRING2);
+	printf("repository/foo.c\n");
+	exit (0);
+}
+""")
+
+# Make the entire repository non-writable, so we'll detect
+# if we try to write into it accidentally.
+test.writable('repository', 0)
+
+
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""foo.h
+bar.h
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+
+
+# Now create the bar.h file locally, and make sure it's still up-to-date.
+# This will change the order in which the include files are listed when
+# calculating the signature; the old order was something like:
+#       /var/tmp/.../bar.h
+#       /var/tmp/.../far.h
+# and the new order will be:
+#       /var/tmp/.../far.h
+#       bar.h
+# Because we write the same bar.h file contents, this should not cause
+# a rebuild (because we sort the resulting signatures).
+
+test.write(['work', 'bar.h'], bar_h_contents)
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+
+
+# And for good measure, write the same foo.h file locally.
+
+test.write(['work', 'foo.h'], foo_h_contents)
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+
+
+test.pass_test()
diff --git a/test/signature-order.py b/test/signature-order.py
new file mode 100644
index 0000000..3fc9f5f
--- /dev/null
+++ b/test/signature-order.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__"
+
+"""
+
+Verify that we do rebuild things when the contents of
+two .h files are swapped, changing the order in which
+dependency signatures show up in the calculated list,
+but 
+
+"""
+
+import sys
+import TestSCons
+
+_exe = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+test.subdir('work1', 'work2')
+
+work1_foo = test.workpath('work1', 'foo' + _exe)
+work2_foo = test.workpath('work2', 'foo' + _exe)
+
+content1 = """\
+#ifndef STRING
+#define STRING  "content1"
+#endif
+"""
+
+content2 = """\
+#ifndef STRING
+#define STRING  "content2"
+#endif
+"""
+
+
+
+test.write(['work1', 'SConstruct'], """\
+env = Environment(CPPPATH = ['.'])
+env.Program(target = 'foo', source = 'foo.c')
+""")
+
+test.write(['work1', 'foo.c'], r"""
+#include <aaa.h>
+#include <bbb.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("%s\n", STRING);
+	exit (0);
+}
+""")
+
+test.write(['work1', 'aaa.h'], content1)
+test.write(['work1', 'bbb.h'], content2)
+
+test.run(chdir = 'work1')
+
+test.run(program = work1_foo, stdout = "content1\n")
+
+test.write(['work1', 'aaa.h'], content2)
+test.write(['work1', 'bbb.h'], content1)
+
+test.run(chdir = 'work1')
+
+test.run(program = work1_foo, stdout = "content2\n")
+
+
+
+test.write(['work2', 'SConstruct'], """\
+env = Environment(CPPPATH = ['.'])
+env.Program(target = 'foo', source = 'foo.c')
+""")
+
+test.write(['work2', 'foo.c'], r"""
+#include "aaa.h"
+#include "bbb.h"
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("%s\n", STRING);
+	exit (0);
+}
+""")
+
+test.write(['work2', 'aaa.h'], content1)
+test.write(['work2', 'bbb.h'], content2)
+
+test.run(chdir = 'work2')
+
+test.run(program = work2_foo, stdout = "content1\n")
+
+test.write(['work2', 'aaa.h'], content2)
+test.write(['work2', 'bbb.h'], content1)
+
+test.run(chdir = 'work2')
+
+test.run(program = work2_foo, stdout = "content2\n")
+
+
+
+test.pass_test()