From aa07e2c4d5ae4f4caa954b06911de9686b75ea44 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 10 Jul 2004 16:36:19 +0000
Subject: [PATCH] Testcases that used the prebuilt runtime library generate
 their own runtime library DLL/so and use that instead now

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6022 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Examples/test-suite/chicken/Makefile.in  |  2 +-
 SWIG/Examples/test-suite/common.mk            | 19 ++++++++++++++-----
 SWIG/Examples/test-suite/guile/Makefile.in    |  2 +-
 SWIG/Examples/test-suite/guilescm/Makefile.in |  2 +-
 SWIG/Examples/test-suite/imports_runtime.i    |  3 +++
 SWIG/Examples/test-suite/mzscheme/Makefile.in |  2 +-
 SWIG/Examples/test-suite/perl5/Makefile.in    |  4 ++--
 SWIG/Examples/test-suite/pike/Makefile.in     |  2 +-
 SWIG/Examples/test-suite/python/Makefile.in   |  4 ++--
 SWIG/Examples/test-suite/ruby/Makefile.in     |  2 +-
 SWIG/Examples/test-suite/tcl/Makefile.in      |  2 +-
 .../template_typedef_import_runtime.i         |  3 +++
 12 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 SWIG/Examples/test-suite/imports_runtime.i
 create mode 100644 SWIG/Examples/test-suite/template_typedef_import_runtime.i

diff --git a/SWIG/Examples/test-suite/chicken/Makefile.in b/SWIG/Examples/test-suite/chicken/Makefile.in
index dd1c2f7bf..c8eb25dc9 100644
--- a/SWIG/Examples/test-suite/chicken/Makefile.in
+++ b/SWIG/Examples/test-suite/chicken/Makefile.in
@@ -40,7 +40,7 @@ SWIGOPT += -noprefix
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(CHICKEN_CSI) $*$(SO) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(CHICKEN_CSI) $*$(SO) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean
diff --git a/SWIG/Examples/test-suite/common.mk b/SWIG/Examples/test-suite/common.mk
index e900e01af..b1609c4d3 100644
--- a/SWIG/Examples/test-suite/common.mk
+++ b/SWIG/Examples/test-suite/common.mk
@@ -35,8 +35,10 @@ TARGETPREFIX =
 TARGETSUFFIX = 
 SWIGOPT    = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
 INCLUDES   = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
-RUNTIMEDIR = $(top_builddir)/Runtime/.libs
-DYNAMIC_LIB_PATH = $(RUNTIMEDIR):.
+#RUNTIMEDIR = $(top_builddir)/Runtime/.libs
+#DYNAMIC_LIB_PATH = .
+LIBS       = -L. -l$*_runtime
+LIBPREFIX  = lib
 
 #
 # Please keep test cases in alphabetical order.
@@ -355,14 +357,21 @@ swig_and_compile_c =  \
 	$(LANGUAGE)$(VARIANT)
 
 swig_and_compile_multi_cpp = \
+	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
+	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBPREFIX='$(LIBPREFIX)' \
+	INCLUDES="$(INCLUDES)" SWIGOPT="-runtime $(SWIGOPT)" NOLINK=true \
+	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)_runtime" INTERFACE="$*_runtime.i" \
+	$(LANGUAGE)$(VARIANT)_cpp && \
 	for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
 	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
-	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" RUNTIMEDIR="$(RUNTIMEDIR)" \
+	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="-noruntime $(SWIGOPT)" NOLINK=true \
 	  TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \
-	  NOLINK=true $(LANGUAGE)$(VARIANT)_multi_cpp; \
+	  $(LANGUAGE)$(VARIANT)_cpp; \
 	done
 
+swig_and_compile_runtime = \
+
 setup = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \
 	  echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \
diff --git a/SWIG/Examples/test-suite/guile/Makefile.in b/SWIG/Examples/test-suite/guile/Makefile.in
index fabeb17c6..8fd0c8093 100644
--- a/SWIG/Examples/test-suite/guile/Makefile.in
+++ b/SWIG/Examples/test-suite/guile/Makefile.in
@@ -38,7 +38,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean
diff --git a/SWIG/Examples/test-suite/guilescm/Makefile.in b/SWIG/Examples/test-suite/guilescm/Makefile.in
index 0f66591e1..6b51a52d2 100644
--- a/SWIG/Examples/test-suite/guilescm/Makefile.in
+++ b/SWIG/Examples/test-suite/guilescm/Makefile.in
@@ -13,7 +13,7 @@ SCRIPTPREFIX = ../guile/
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 setup = \
diff --git a/SWIG/Examples/test-suite/imports_runtime.i b/SWIG/Examples/test-suite/imports_runtime.i
new file mode 100644
index 000000000..eafb94f80
--- /dev/null
+++ b/SWIG/Examples/test-suite/imports_runtime.i
@@ -0,0 +1,3 @@
+// Empty module for building the runtime library
+%module imports_runtime
+
diff --git a/SWIG/Examples/test-suite/mzscheme/Makefile.in b/SWIG/Examples/test-suite/mzscheme/Makefile.in
index fdf2b29a0..1bfa71da0 100644
--- a/SWIG/Examples/test-suite/mzscheme/Makefile.in
+++ b/SWIG/Examples/test-suite/mzscheme/Makefile.in
@@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH mzscheme -r $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH mzscheme -r $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean
diff --git a/SWIG/Examples/test-suite/perl5/Makefile.in b/SWIG/Examples/test-suite/perl5/Makefile.in
index 11d0abbea..78747c8a5 100644
--- a/SWIG/Examples/test-suite/perl5/Makefile.in
+++ b/SWIG/Examples/test-suite/perl5/Makefile.in
@@ -12,7 +12,7 @@ top_builddir = @top_builddir@
 include $(srcdir)/../common.mk
 
 # Overridden variables here
-SWIGOPT    = -shadow -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
+# none!
 
 # Rules for the different types of tests
 %.cpptest: 
@@ -34,7 +34,7 @@ SWIGOPT    = -shadow -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
 # a file is found which has _runme.pl appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH @PERL@ $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH @PERL@ $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean: remove the generated .pm file
diff --git a/SWIG/Examples/test-suite/pike/Makefile.in b/SWIG/Examples/test-suite/pike/Makefile.in
index cb89eef2c..5801486de 100644
--- a/SWIG/Examples/test-suite/pike/Makefile.in
+++ b/SWIG/Examples/test-suite/pike/Makefile.in
@@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.pike appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH pike $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH pike $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean: remove the generated .pike file
diff --git a/SWIG/Examples/test-suite/python/Makefile.in b/SWIG/Examples/test-suite/python/Makefile.in
index 8d3f68537..6b773850a 100644
--- a/SWIG/Examples/test-suite/python/Makefile.in
+++ b/SWIG/Examples/test-suite/python/Makefile.in
@@ -32,7 +32,7 @@ CPP_TEST_CASES += \
 include $(srcdir)/../common.mk
 
 # Overridden variables here
-# none!
+LIBS       = -L. -l_$*_runtime
 
 # Rules for the different types of tests
 %.cpptest: 
@@ -54,7 +54,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.py appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH python $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH python $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean: remove the generated .py file
diff --git a/SWIG/Examples/test-suite/ruby/Makefile.in b/SWIG/Examples/test-suite/ruby/Makefile.in
index 9f2962c7e..5c3e9aba7 100644
--- a/SWIG/Examples/test-suite/ruby/Makefile.in
+++ b/SWIG/Examples/test-suite/ruby/Makefile.in
@@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.rb appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH ruby $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ruby $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean
diff --git a/SWIG/Examples/test-suite/tcl/Makefile.in b/SWIG/Examples/test-suite/tcl/Makefile.in
index e704b7832..c94f98195 100644
--- a/SWIG/Examples/test-suite/tcl/Makefile.in
+++ b/SWIG/Examples/test-suite/tcl/Makefile.in
@@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
 # a file is found which has _runme.tcl appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH tclsh $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH tclsh $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
 	fi;
 
 # Clean
diff --git a/SWIG/Examples/test-suite/template_typedef_import_runtime.i b/SWIG/Examples/test-suite/template_typedef_import_runtime.i
new file mode 100644
index 000000000..ee20dd7c0
--- /dev/null
+++ b/SWIG/Examples/test-suite/template_typedef_import_runtime.i
@@ -0,0 +1,3 @@
+// Empty module for building the runtime library
+%module template_typedef_import_runtime
+