Support construction variable expansion anywhere in a file or path name.

1 files changed, 14 insertions, 3 deletions

diff --git a/test/AlwaysBuild.py b/test/AlwaysBuild.py
index f4126c15..832120ac 100644
--- a/test/AlwaysBuild.py
+++ b/test/AlwaysBuild.py
@@ -31,25 +31,36 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-test.write('SConstruct', """
+test.subdir('sub')
+
+test.write('SConstruct', """\
 def bfunc(target, source, env):
     import shutil
     shutil.copyfile('f2.in', str(target[0]))
 
 B = Builder(action=bfunc)
-env = Environment(BUILDERS = { 'B' : B })
+env = Environment(BUILDERS = { 'B' : B }, SUBDIR='sub')
 env.B('f1.out', source='f1.in')
 env.AlwaysBuild('f1.out')
-""")
+
+env.B(r'%s', source='f3.in')
+env.AlwaysBuild(r'%s')
+""" % (os.path.join('sub', 'f3.out'),
+       os.path.join('$SUBDIR', 'f3.out')
+      ))
 
 test.write('f1.in', "f1.in\n")
 test.write('f2.in', "1")
+test.write('f3.in', "f3.in\n")
 
 test.run(arguments = ".")
 test.fail_test(test.read('f1.out') != '1')
+test.fail_test(test.read(['sub', 'f3.out']) != '1')
 
 test.write('f2.in', "2")
+
 test.run(arguments = ".")
 test.fail_test(test.read('f1.out') != '2')
+test.fail_test(test.read(['sub', 'f3.out']) != '2')
 
 test.pass_test()