diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-11-27 23:25:05 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-11-27 23:25:05 (GMT) |
| commit | 30247efa139711be7f2d7342c01b1c817985df0c (patch) | |
| tree | b4360925e1c5102aa58c51b5c68e64d0c01ca84f /test/CXX/SHCXXCOMSTR.py | |
| parent | 3031330216256cbff09b5631fdf68fa75d2439f2 (diff) | |
| parent | d938777da7f4b9e908075dabb1554bef9882d60f (diff) | |
| download | SCons-30247efa139711be7f2d7342c01b1c817985df0c.zip SCons-30247efa139711be7f2d7342c01b1c817985df0c.tar.gz SCons-30247efa139711be7f2d7342c01b1c817985df0c.tar.bz2 | |
update from upstream
Diffstat (limited to 'test/CXX/SHCXXCOMSTR.py')
| -rw-r--r-- | test/CXX/SHCXXCOMSTR.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py index 716c9ad..77075e4 100644 --- a/test/CXX/SHCXXCOMSTR.py +++ b/test/CXX/SHCXXCOMSTR.py @@ -32,25 +32,15 @@ the shared object C++ compilation output. import TestSCons _python_ = TestSCons._python_ -_exe = TestSCons._exe test = TestSCons.TestSCons() - - -test.write('mycc.py', r""" -import sys -outfile = open(sys.argv[1], 'wb') -infile = open(sys.argv[2], 'rb') -for l in [l for l in infile.readlines() if l != '/*c++*/\n']: - outfile.write(l) -sys.exit(0) -""") +test.file_fixture('mycompile.py') alt_cpp_suffix=test.get_alt_cpp_suffix() test.write('SConstruct', """ -env = Environment(SHCXXCOM = r'%(_python_)s mycc.py $TARGET $SOURCE', +env = Environment(SHCXXCOM = r'%(_python_)s mycompile.py c++ $TARGET $SOURCE', SHCXXCOMSTR = 'Building shared object $TARGET from $SOURCE', SHOBJPREFIX='', SHOBJSUFFIX='.obj') env.SharedObject(target = 'test1', source = 'test1.cpp') @@ -84,8 +74,6 @@ test.must_match('test4.obj', "test4.c++\n") test.must_match('test5.obj', "test5.C++\n") test.must_match('test6.obj', "test6.C\n") - - test.pass_test() # Local Variables: |