fixes for chicken and the STL/STD cases

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7809 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Examples/test-suite/chicken/Makefile.in

@@ -15,6 +15,9 @@ SO           = @SO@
 
 #C_TEST_CASES = long_long list_vector pointer_in_out multivalue
 
+# Skip the STD cases for now
+SKIP_CPP_STD_CASES = Yes
+
 include $(srcdir)/../common.mk
 
 # Overridden variables here
@@ -77,7 +80,7 @@ run_testcase = \
 
 # Clean
 %.clean:
-	
+
 clean:
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile chicken_clean
 	rm -f *.scm

SWIG/Examples/test-suite/common.mk

@@ -123,7 +123,6 @@ CPP_TEST_CASES += \
 	director_nested \
 	director_protected \
 	director_redefined \
-	director_string \
 	director_unroll \
 	director_wombat \
 	disown \
@@ -162,11 +161,7 @@ CPP_TEST_CASES += \
 	li_carrays \
 	li_cdata \
 	li_cpointer \
-	li_std_deque \
-	li_std_except \
-        li_std_pair \
 	li_std_string \
-	li_std_vector \
 	li_typemaps \
 	long_long_apply \
 	member_template \
@@ -261,7 +256,6 @@ CPP_TEST_CASES += \
 	template_ns_enum2 \
 	template_ns_inherit \
 	template_ns_scope \
-	template_opaque \
 	template_partial_arg \
 	template_qualifier \
 	template_qualifier \
@@ -273,14 +267,12 @@ CPP_TEST_CASES += \
 	template_specialization_enum \
 	template_static \
 	template_tbase_template \
-	template_type_namespace \
 	template_typedef \
 	template_typedef_cplx \
 	template_typedef_cplx2 \
 	template_typedef_cplx3 \
 	template_typedef_cplx4 \
 	template_typedef_cplx5 \
-	template_typedef_fnc \
 	template_typedef_ns \
 	template_typedef_ptr \
 	template_using \
@@ -322,6 +314,24 @@ CPP_TEST_CASES += \
 	voidtest \
 	wrapmacro
 
+#
+# Put all the heavy STD/STL cases here, where they can be skipped if needed
+#
+CPP_STD_TEST_CASES += \
+	director_string \
+	li_std_deque \
+	li_std_except \
+        li_std_pair \
+	li_std_vector \
+	template_typedef_fnc \
+	template_type_namespace \
+	template_opaque \
+
+ifndef SKIP_CPP_STD_CASES
+CPP_TEST_CASES += ${CPP_STD_TEST_CASES}
+endif
+
+
 # C test cases. (Can be run individually using make testcase.ctest.)
 C_TEST_CASES += \
 	arrays \

SWIG/Examples/test-suite/sizet.i

@@ -3,8 +3,9 @@
 #include <vector>
 %}
 
+#ifndef SWIGCHICKEN
 %include "std_common.i"
-%include "std_vector.i"
+#endif
 
 %inline
 {
@@ -26,6 +27,8 @@
 }
 
 #ifdef SWIGPYTHON
+%include "std_vector.i"
+
 %template(vectors) std::vector<unsigned long>;
   
 %inline 

SWIG/Examples/test-suite/template_default.i

@@ -197,6 +197,7 @@ namespace ns1 {
 %}
 
 
+#ifndef SWIGCHICKEN
 %include std_vector.i
 
 %{
@@ -213,3 +214,4 @@ void q(double = 0) {}
 %constant void (*Cf)(double = 0) = q; 
 
 
+#endif