Fix broken swig tests when python being used to run tests is incompatible with system...

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).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3443 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py
index 85ad7f5049e0afee34b95311e50228547b770780..1bee0c2e1c297bb56a57f017d24331ecba9105a7 100644 (file)
--- 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 893d8394dfe5e4b40766ad74c20411fdc8543b5d..cfaf019a18d1926b3ed027ef3676b7c94a09e774 100644 (file)
--- 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 3dabacf4608c4053e7381cbf9255613479673c84..e30b93e66ba1c84e819737a9f7ed92e9f92c48db 100644 (file)
--- 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 ca681ea4653a32d573e205c8606b469a22c687f7..fad85778577dbe58e35b16d7191d737885a37436 100644 (file)
--- 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 f96b706f0e5603c756ff123bf4e760c47620b488..c3c8cf0d75b2870316e595d64fe8f661ffbe054d 100644 (file)
--- 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