Fix files with the same name as subdirs.

2 files changed, 80 insertions, 3 deletions

diff --git a/test/no-target.py b/test/no-target.py
index dd24a8d..45e1088 100644
--- a/test/no-target.py
+++ b/test/no-target.py
@@ -30,8 +30,9 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-test.subdir('subdir')
+test.subdir('subdir', ['subdir', 'ccc'])
 
+ccc_ccc_in = os.path.join('ccc', 'ccc.in')
 subdir_SConscript = os.path.join('subdir', 'SConscript')
 
 test.write('SConstruct', r"""
@@ -42,7 +43,6 @@ test.write(subdir_SConscript, r"""
 def cat(env, source, target):
     target = str(target[0])
     source = map(str, source)
-    print 'cat(%s) > %s' % (source, target)
     f = open(target, "wb")
     for src in source:
         f.write(open(src, "rb").read())
@@ -53,16 +53,19 @@ env = Environment(BUILDERS={'Build':b})
 env.Build('aaa.in')
 n = env.Build('bbb.in', 'bbb.input')
 env.Build(n)
-""")
+env.Build(source = r'%s')
+""" % ccc_ccc_in)
 
 test.write(['subdir', 'aaa.in'], "subdir/aaa.in\n")
 test.write(['subdir', 'bbb.input'], "subdir/bbb.input\n")
+test.write(['subdir', 'ccc', 'ccc.in'], "subdir/ccc/ccc.in\n")
 
 #
 test.run(arguments = '.')
 
 test.fail_test(test.read(['subdir', 'aaa.out']) != "subdir/aaa.in\n")
 test.fail_test(test.read(['subdir', 'bbb.out']) != "subdir/bbb.input\n")
+test.fail_test(test.read(['subdir', 'ccc', 'ccc.out']) != "subdir/ccc/ccc.in\n")
 
 #
 test.pass_test()
diff --git a/test/same-name.py b/test/same-name.py
new file mode 100644
index 0000000..7b5fd55
--- /dev/null
+++ b/test/same-name.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Make sure that we can build from a source file with the same basename as
+the subdirectory in which it lives.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('bu')
+
+test.write('SConstruct', """
+env = Environment(CPPPATH = ['.'])
+env.Program(source = ['foo.c', 'bu/bu.c'])
+""")
+
+test.write('foo.c', r"""
+#include <bu/bu.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+        bu();
+	printf("foo.c\n");
+	exit (0);
+}
+""")
+
+test.write(['bu', 'bu.h'], r"""
+void bu(void);
+""")
+
+test.write(['bu', 'bu.c'], r"""
+void
+bu(void)
+{
+        printf("bu/bu.c\n");
+}
+""")
+
+test.run(arguments = '.')
+
+test.run(program = test.workpath("foo"), stdout ="""\
+bu/bu.c
+foo.c
+""")
+
+test.pass_test()