diff options
| author | William Deegan <bill@baddogconsulting.com> | 2008-09-20 05:42:59 +0000 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2008-09-20 05:42:59 +0000 |
| commit | 11d43d68f8b30f150ff3c0b9079d825ed8225b74 (patch) | |
| tree | e2266e680bdc135d00781f1c12c871259d5fdfa6 /test/SWIG | |
| parent | 221fccac2cac38cb22dd6aab983897333e36a30d (diff) | |
| download | scons-11d43d68f8b30f150ff3c0b9079d825ed8225b74.tar.gz | |
Fix broken swig tests when python being used to run tests is incompatible with system swig.
Propagate to the created SConstructs the version of swig found by the test (which is used to determine whether to run or not run this test).
Diffstat (limited to 'test/SWIG')
| -rw-r--r-- | test/SWIG/build-dir.py | 1 | ||||
| -rw-r--r-- | test/SWIG/live.py | 1 | ||||
| -rw-r--r-- | test/SWIG/module-parens.py | 1 | ||||
| -rw-r--r-- | test/SWIG/remove-modules.py | 1 | ||||
| -rw-r--r-- | test/SWIG/subdir.py | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py index 85ad7f50..1bee0c2e 100644 --- a/test/SWIG/build-dir.py +++ b/test/SWIG/build-dir.py @@ -66,6 +66,7 @@ test.write(['SConstruct'], """\ # env = Environment(CPPPATH = [".", r'%(python_include_dir)s'], CPPDEFINES = "NDEBUG", + SWIG =r'%(swig)s', SWIGFLAGS = ["-python", "-c++"], SWIGCXXFILESUFFIX = "_wrap.cpp", LDMODULEPREFIX='_', diff --git a/test/SWIG/live.py b/test/SWIG/live.py index 893d8394..cfaf019a 100644 --- a/test/SWIG/live.py +++ b/test/SWIG/live.py @@ -84,6 +84,7 @@ foo = Environment(SWIGFLAGS='-python', LDMODULEPREFIX='%(ldmodule_prefix)s', LDMODULESUFFIX='%(_dll)s', FRAMEWORKS='%(python_frameworks)s', + SWIG=r'%(swig)s', #LIBS=%(python_library_path)s, ) diff --git a/test/SWIG/module-parens.py b/test/SWIG/module-parens.py index 3dabacf4..e30b93e6 100644 --- a/test/SWIG/module-parens.py +++ b/test/SWIG/module-parens.py @@ -50,6 +50,7 @@ if not os.path.exists(Python_h): test.write(['SConstruct'], """\ env = Environment(SWIGFLAGS = '-python -c++', CPPPATH=r"%(python_include_dir)s", + SWIG=r'%(swig)s', FRAMEWORKS='%(python_frameworks_flags)s', ) diff --git a/test/SWIG/remove-modules.py b/test/SWIG/remove-modules.py index ca681ea4..fad85778 100644 --- a/test/SWIG/remove-modules.py +++ b/test/SWIG/remove-modules.py @@ -73,6 +73,7 @@ foo = Environment(SWIGFLAGS='-python', LDMODULEPREFIX='%(ldmodule_prefix)s', LDMODULESUFFIX='%(_dll)s', FRAMEWORKS='%(python_frameworks_flags)s', + SWIG=r'%(swig)s', ) import sys diff --git a/test/SWIG/subdir.py b/test/SWIG/subdir.py index f96b706f..c3c8cf0d 100644 --- a/test/SWIG/subdir.py +++ b/test/SWIG/subdir.py @@ -71,6 +71,7 @@ env = Environment(SWIGFLAGS='-python', LDMODULEPREFIX='%(ldmodule_prefix)s', LDMODULESUFFIX='%(_dll)s', FRAMEWORKS='%(python_frameworks_flags)s', + SWIG=r'%(swig)s', ) import sys |