From fa63153c9ba99481ce070c5eca25016d08a6a13f Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sat, 20 Sep 2008 05:42:59 +0000
Subject: 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).

---
 test/SWIG/build-dir.py      | 1 +
 test/SWIG/live.py           | 1 +
 test/SWIG/module-parens.py  | 1 +
 test/SWIG/remove-modules.py | 1 +
 test/SWIG/subdir.py         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py
index 85ad7f5..1bee0c2 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 893d839..cfaf019 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 3dabacf..e30b93e 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 ca681ea..fad8577 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 f96b706..c3c8cf0 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
-- 
cgit v0.12