diff options
| author | Steven Knight <knight@baldmt.com> | 2009-11-28 04:52:19 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-11-28 04:52:19 +0000 |
| commit | 7824bdb766aef1fe82322aedfbb59ddd0d3d4dea (patch) | |
| tree | fc3366b22e4575a66eacd0d2b7784f3d41c35517 /test/SWIG | |
| parent | d95144094314ec7e9c4bd0f472251958d38ca708 (diff) | |
| download | scons-7824bdb766aef1fe82322aedfbb59ddd0d3d4dea.tar.gz | |
Don't hard-code the swig location in the expected output.
Use test.wrap_stdout() instead of hard-coding the SCons messages.
Diffstat (limited to 'test/SWIG')
| -rw-r--r-- | test/SWIG/generated_swigfile.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/test/SWIG/generated_swigfile.py b/test/SWIG/generated_swigfile.py index 844f7868..1187df22 100644 --- a/test/SWIG/generated_swigfile.py +++ b/test/SWIG/generated_swigfile.py @@ -49,7 +49,6 @@ else: _dll = '.so' test = TestSCons.TestSCons() -test.verbose_set(1) swig = test.where_is('swig') if not swig: @@ -77,16 +76,13 @@ java_c_file = foo.CFile( target='java_swig_test' ,source=java_interface, SW """ % locals()) -expected_stdout = """scons: Reading SConscript files ... -scons: done reading SConscript files. -scons: Building targets ... -echo '%module test_java_swig' > test_java_swig.i -/usr/bin/swig -o java_swig_test_wrap.cc -java -c++ test_java_swig.i -echo '%module test_py_swig' > test_py_swig.i -/usr/bin/swig -o python_swig_test_wrap.cc -python -c++ test_py_swig.i -scons: done building targets. -""" -test.run(arguments = '.',stdout=expected_stdout) +expected_stdout = """\ +echo '%%module test_java_swig' > test_java_swig.i +%(swig)s -o java_swig_test_wrap.cc -java -c++ test_java_swig.i +echo '%%module test_py_swig' > test_py_swig.i +%(swig)s -o python_swig_test_wrap.cc -python -c++ test_py_swig.i +""" % locals() +test.run(arguments = '.',stdout=test.wrap_stdout(expected_stdout)) # If we mistakenly depend on the .py file that SWIG didn't create |