Fix files with the same name as subdirs.

1 files changed, 6 insertions, 3 deletions

diff --git a/test/no-target.py b/test/no-target.py
index dd24a8d7..45e10881 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()