diff options
Diffstat (limited to 'test/MSVC')
| -rw-r--r-- | test/MSVC/PCHCOM.py | 16 | ||||
| -rw-r--r-- | test/MSVC/PCHCOMSTR.py | 16 | ||||
| -rw-r--r-- | test/MSVC/RCCOM.py | 16 | ||||
| -rw-r--r-- | test/MSVC/RCCOMSTR.py | 16 |
4 files changed, 8 insertions, 56 deletions
diff --git a/test/MSVC/PCHCOM.py b/test/MSVC/PCHCOM.py index ff27e10..fefab92 100644 --- a/test/MSVC/PCHCOM.py +++ b/test/MSVC/PCHCOM.py @@ -34,21 +34,11 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() - - -test.write('mypch.py', """ -import sys -outfile = open(sys.argv[1], 'wb') -for f in sys.argv[2:]: - infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != '/*pch*/\\n']: - outfile.write(l) -sys.exit(0) -""") +test.file_fixture('mycompile.py') test.write('SConstruct', """ env = Environment(tools=['default', 'msvc'], - PCHCOM = r'%(_python_)s mypch.py $TARGET $SOURCES') + PCHCOM = r'%(_python_)s mycompile.py pch $TARGET $SOURCES') env.PCH(target = 'aaa', source = 'aaa.h') """ % locals()) @@ -58,8 +48,6 @@ test.run(arguments = ".") test.must_match('aaa.pch', "aaa.h\n") - - test.pass_test() # Local Variables: diff --git a/test/MSVC/PCHCOMSTR.py b/test/MSVC/PCHCOMSTR.py index 51f56fb..beea488 100644 --- a/test/MSVC/PCHCOMSTR.py +++ b/test/MSVC/PCHCOMSTR.py @@ -35,21 +35,11 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() - - -test.write('mypch.py', """ -import sys -outfile = open(sys.argv[1], 'wb') -for f in sys.argv[2:]: - infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != '/*pch*/\\n']: - outfile.write(l) -sys.exit(0) -""") +test.file_fixture('mycompile.py') test.write('SConstruct', """ env = Environment(tools=['default', 'msvc'], - PCHCOM = r'%(_python_)s mypch.py $TARGET $SOURCES', + PCHCOM = r'%(_python_)s mycompile.py pch $TARGET $SOURCES', PCHCOMSTR = 'PCHing $TARGET from $SOURCE') env.PCH(target = 'aaa', source = 'aaa.h') """ % locals()) @@ -62,8 +52,6 @@ PCHing aaa.pch from aaa.h test.must_match('aaa.pch', "aaa.h\n") - - test.pass_test() # Local Variables: diff --git a/test/MSVC/RCCOM.py b/test/MSVC/RCCOM.py index 05382b8..04f8fff 100644 --- a/test/MSVC/RCCOM.py +++ b/test/MSVC/RCCOM.py @@ -35,21 +35,11 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() - - -test.write('myrc.py', """ -import sys -outfile = open(sys.argv[1], 'wb') -for f in sys.argv[2:]: - infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != '/*rc*/\\n']: - outfile.write(l) -sys.exit(0) -""") +test.file_fixture('mycompile.py') test.write('SConstruct', """ env = Environment(tools=['default', 'msvc'], - RCCOM = r'%(_python_)s myrc.py $TARGET $SOURCES') + RCCOM = r'%(_python_)s mycompile.py rc $TARGET $SOURCES') env.RES(target = 'aaa', source = 'aaa.rc') """ % locals()) @@ -59,8 +49,6 @@ test.run(arguments = ".") test.must_match('aaa.res', "aaa.rc\n") - - test.pass_test() # Local Variables: diff --git a/test/MSVC/RCCOMSTR.py b/test/MSVC/RCCOMSTR.py index 8425d73..2630651 100644 --- a/test/MSVC/RCCOMSTR.py +++ b/test/MSVC/RCCOMSTR.py @@ -35,21 +35,11 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() - - -test.write('myrc.py', """ -import sys -outfile = open(sys.argv[1], 'wb') -for f in sys.argv[2:]: - infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != '/*rc*/\\n']: - outfile.write(l) -sys.exit(0) -""") +test.file_fixture('mycompile.py') test.write('SConstruct', """ env = Environment(tools=['default', 'msvc'], - RCCOM = r'%(_python_)s myrc.py $TARGET $SOURCES', + RCCOM = r'%(_python_)s mycompile.py rc $TARGET $SOURCES', RCCOMSTR = 'RCing $TARGET from $SOURCE') env.RES(target = 'aaa', source = 'aaa.rc') """ % locals()) @@ -62,8 +52,6 @@ RCing aaa.res from aaa.rc test.must_match('aaa.res', "aaa.rc\n") - - test.pass_test() # Local Variables: |