summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJim Randall <dreadfest@gmail.com>2008-08-22 13:27:56 (GMT)
committerJim Randall <dreadfest@gmail.com>2008-08-22 13:27:56 (GMT)
commit05aba45c8e1878f2b5ef366fbc8d9da2567d4e55 (patch)
tree3162a85cc37474c72051732a9afe957a66e275d9 /test
parentf2d3c4cd624fdd67ef7b21ba1cb1c103401af827 (diff)
downloadSCons-05aba45c8e1878f2b5ef366fbc8d9da2567d4e55.zip
SCons-05aba45c8e1878f2b5ef366fbc8d9da2567d4e55.tar.gz
SCons-05aba45c8e1878f2b5ef366fbc8d9da2567d4e55.tar.bz2
call subst on the line passed to Environment.WhereIs
Diffstat (limited to 'test')
-rw-r--r--test/WhereIs.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/WhereIs.py b/test/WhereIs.py
index dccfefb..a2c5b01 100644
--- a/test/WhereIs.py
+++ b/test/WhereIs.py
@@ -74,13 +74,16 @@ print env.WhereIs('xxx.exe', %s)
print WhereIs('xxx.exe', %s)
print WhereIs('xxx.exe', %s)
print WhereIs('xxx.exe', %s, reject=%s)
+env.Replace( XXXNAME='xxx.exe' )
+print env.WhereIs( '$XXXNAME', %s )
""" % (subdir_SConscript,
repr(string.join(pathdirs_1234, os.pathsep)),
repr(string.join(pathdirs_1243, os.pathsep)),
repr(pathdirs_1234),
repr(pathdirs_1243),
repr(pathdirs_1243),
- repr(sub4_xxx_exe)
+ repr(sub4_xxx_exe),
+ repr(string.join(pathdirs_1243, os.pathsep)),
))
test.write(subdir_SConscript, """
@@ -109,6 +112,7 @@ expect = [ test.workpath(sub3_xxx_exe),
test.workpath(sub3_xxx_exe),
test.workpath(sub4_xxx_exe),
test.workpath(sub3_xxx_exe),
+ test.workpath(sub4_xxx_exe)
]
test.run(arguments = ".",
@@ -128,10 +132,12 @@ expect = [ test.workpath(sub4_xxx_exe),
test.workpath(sub3_xxx_exe),
test.workpath(sub4_xxx_exe),
test.workpath(sub3_xxx_exe),
+ test.workpath(sub4_xxx_exe)
]
test.run(arguments = ".",
stdout = test.wrap_stdout(read_str = string.join(expect, "\n") + "\n",
build_str = "scons: `.' is up to date.\n"))
+
test.pass_test()