Merged revisions 1667-1674 via svnmerge from

[scons.git] / test / CXX / CXXFILESUFFIX.py

diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py
index d729076a563f40fd8395dc36ea9727ba621252ea..b156f748bc58648a4b83869da6e81c7bdbcfa906 100644 (file)
--- a/test/CXX/CXXFILESUFFIX.py
+++ b/test/CXX/CXXFILESUFFIX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = TestSCons.python
+_python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
@@ -46,19 +46,19 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LEX = r'%s mylex.py', tools = ['lex'])
+env = Environment(LEX = r'%(_python_)s mylex.py', tools = ['lex'])
 env.CXXFile(target = 'foo', source = 'foo.ll')
-env.Copy(CXXFILESUFFIX = '.xyz').CXXFile(target = 'bar', source = 'bar.ll')
-""" % python)
+env.Clone(CXXFILESUFFIX = '.xyz').CXXFile(target = 'bar', source = 'bar.ll')
+""" % locals())
 
 input = r"""
 int
 main(int argc, char *argv[])
 {
-       argv[argc++] = "--";
-       printf("LEX\n");
-       printf("%s\n");
-       exit (0);
+        argv[argc++] = "--";
+        printf("LEX\n");
+        printf("%s\n");
+        exit (0);
 }
 """