better way to provide custom commandline options for individual tests

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

Examples/test-suite/allegrocl/Makefile.in

@@ -89,8 +89,12 @@ SKIP_CPP_STD_CASES = Yes
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # SWIGOPT += -debug-module 4
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/cffi/Makefile.in

@@ -11,10 +11,14 @@ top_builddir = @top_builddir@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # no C++ tests for now
 CPP_TEST_CASES =
 #C_TEST_CASES += 
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/chicken/Makefile.in

@@ -23,10 +23,12 @@ EXTRA_TEST_CASES += chicken_ext_test.externaltest
 
 include $(srcdir)/../common.mk
 
-
 # Overridden variables here
 SWIGOPT += -nounit
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/clisp/Makefile.in

@@ -11,10 +11,14 @@ top_builddir = @top_builddir@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # no C++ tests for now
 CPP_TEST_CASES =
 #C_TEST_CASES += 
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/common.mk

@@ -16,8 +16,8 @@
 #    b) Define rules for %.ctest, %.cpptest, %.multicpptest and %.clean.
 #    c) Define srcdir, top_srcdir and top_builddir (these are the
 #       equivalent to configure's variables of the same name).
-# 3) One off special commandline options can be achieved by adding a
+# 3) One off special commandline options for a testcase can be added.
-#    test case to CUSTOM_TEST_CASES and defining rules to run and test.
+#    See custom tests below.
 #
 # The 'check' target runs the testcases including SWIG invocation,
 # C/C++ compilation, target language compilation (if any) and runtime
@@ -60,7 +60,6 @@ CSRCS      =
 TARGETPREFIX = 
 TARGETSUFFIX = 
 SWIGOPT    = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
-SWIGOPTCUSTOM =
 INCLUDES   = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
 LIBS       = -L.
 LIBPREFIX  = lib
@@ -72,7 +71,7 @@ INTERFACEDIR = ../
 # Note that any whitespace after the last entry in each list will break make
 #
 
-# Broken C++ test cases. (Can be run individually using make testcase.cpptest.)
+# Broken C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_BROKEN += \
 	constants \
 	cpp_broken \
@@ -86,12 +85,12 @@ CPP_TEST_BROKEN += \
 	template_expr
 
 
-# Broken C test cases. (Can be run individually using make testcase.ctest.)
+# Broken C test cases. (Can be run individually using: make testcase.ctest)
 C_TEST_BROKEN += \
 	tag_no_clash_with_variable
 
 
-# C++ test cases. (Can be run individually using make testcase.cpptest.)
+# C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_CASES += \
 	abstract_access \
 	abstract_inherit \
@@ -143,6 +142,7 @@ CPP_TEST_CASES += \
 	cpp_nodefault \
 	cpp_static \
 	cpp_typedef \
+	custom_wallkw \
 	default_args \
 	default_constructor \
 	defvalue_constructor \
@@ -421,7 +421,7 @@ CPP_TEST_CASES += ${CPP_STD_TEST_CASES}
 endif
 
 
-# C test cases. (Can be run individually using make testcase.ctest.)
+# C test cases. (Can be run individually using: make testcase.ctest)
 C_TEST_CASES += \
 	arrays \
 	char_constant \
@@ -460,7 +460,7 @@ C_TEST_CASES += \
 	unions
 
 
-# Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest.)
+# Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest)
 MULTI_CPP_TEST_CASES += \
 	clientdata_prop \
 	imports \
@@ -469,20 +469,13 @@ MULTI_CPP_TEST_CASES += \
 	template_typedef_import \
 	multi_import
 
-# Non standard testcases, usually using custom commandline options
+# Custom tests - tests with additional commandline options
-# Testcase names are prefixed with custom_ and can be run individually using make testcase.customtest
+custom_wallkw.cpptest: SWIGOPT += -Wallkw
-CUSTOM_TEST_CASES = \
-	custom_wallkw \
 
-# individual custom tests - any kind of customisation allowed here
-# Note: $(basename $@) strips everything after and including the . in the target name
-custom_wallkw.customtest: 
-	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-Wallkw"
 
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \
 			$(C_TEST_CASES:=.ctest) \
 			$(MULTI_CPP_TEST_CASES:=.multicpptest) \
-			$(CUSTOM_TEST_CASES:=.customtest) \
 			$(EXTRA_TEST_CASES)
 
 BROKEN_TEST_CASES = 	$(CPP_TEST_BROKEN:=.cpptest) \
@@ -491,7 +484,6 @@ BROKEN_TEST_CASES = 	$(CPP_TEST_BROKEN:=.cpptest) \
 ALL_CLEAN = 		$(CPP_TEST_CASES:=.clean) \
 			$(C_TEST_CASES:=.clean) \
 			$(MULTI_CPP_TEST_CASES:=.clean) \
-			$(CUSTOM_TEST_CASES:=.clean) \
 			$(CPP_TEST_BROKEN:=.clean) \
 			$(C_TEST_BROKEN:=.clean)
 
@@ -511,14 +503,14 @@ broken: $(BROKEN_TEST_CASES)
 swig_and_compile_cpp =  \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)_cpp
 
 swig_and_compile_c =  \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)
 
@@ -526,7 +518,7 @@ swig_and_compile_multi_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)" LIBS='$(LIBS)' \
-	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	  TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
 	  $(LANGUAGE)$(VARIANT)_cpp; \
 	done
@@ -538,7 +530,7 @@ swig_and_compile_external =  \
 	$(LANGUAGE)$(VARIANT)_externalhdr; \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)_cpp
 

Examples/test-suite/csharp/Makefile.in

@@ -15,14 +15,12 @@ CPP_TEST_CASES = \
 	csharp_attributes \
 	csharp_exceptions \
 	csharp_features \
+	csharp_lib_arrays \
 	csharp_prepost \
 	csharp_typemaps \
 	enum_thorough_simple \
 	enum_thorough_typesafe \
-	exception_partial_info
+	exception_partial_info \
-
-CUSTOM_TEST_CASES = \
-	csharp_lib_arrays \
 	intermediary_classname
 
 include $(srcdir)/../common.mk
@@ -33,6 +31,10 @@ INTERFACEDIR = ../../
 
 CSHARPFLAGSSPECIAL =
 
+# Custom tests - tests with additional commandline options
+intermediary_classname.cpptest: SWIGOPT += -dllimport intermediary_classname
+csharp_lib_arrays.cpptest: CSHARPFLAGSSPECIAL = -unsafe
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)
@@ -49,12 +51,6 @@ CSHARPFLAGSSPECIAL =
 	+(cd $* && $(swig_and_compile_multi_cpp))
 	+$(run_testcase)
 
-# Rules for custom tests
-intermediary_classname.customtest: 
-	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-dllimport intermediary_classname"
-csharp_lib_arrays.customtest: 
-	$(MAKE) $(basename $@).cpptest CSHARPFLAGSSPECIAL="-unsafe"
-
 # Makes a directory for the testcase if it does not exist
 setup = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \

Examples/test-suite/guile/Makefile.in

@@ -17,6 +17,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/guilescm/Makefile.in

@@ -6,12 +6,15 @@ EXTRA_TEST_CASES += guilescm_ext_test.externaltest
 
 include ../guile/Makefile
 
+# Overridden variables here
 INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guilescm
-
 VARIANT      =
 # Refer to the guile directory for the run scripts
 SCRIPTPREFIX = ../guile/
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \

Examples/test-suite/java/Makefile.in

@@ -40,6 +40,9 @@ include $(srcdir)/../common.mk
 SWIGOPT += -package $*
 INTERFACEDIR = ../../
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/lua/Makefile.in

@@ -24,6 +24,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 LIBS       = -L.
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/mzscheme/Makefile.in

@@ -14,6 +14,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/ocaml/Makefile.in

@@ -44,6 +44,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest:
 	echo $@ >> testing

Examples/test-suite/octave/Makefile.in

@@ -34,6 +34,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 LIBS       = -L.
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/perl5/Makefile.in

@@ -27,6 +27,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/php/Makefile.in

@@ -16,6 +16,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 TARGETPREFIX =# Should be php_ for Windows, empty otherwise
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # write out tests without a _runme.php
 missingcpptests:
 	for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done

Examples/test-suite/pike/Makefile.in

@@ -14,6 +14,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/python/Makefile.in

@@ -89,6 +89,9 @@ include $(srcdir)/../common.mk
 LIBS       = -L.
 VALGRIND_OPT += --suppressions=pythonswig.supp
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/r/Makefile.in

@@ -16,6 +16,10 @@ CPP_TEST_CASES = r_double_delete
 include $(srcdir)/../common.mk
 
 # Overridden variables here
+# none!
+
+# Custom tests - tests with additional commandline options
+# none!
 
 # Rules for the different types of tests
 %.cpptest: 

Examples/test-suite/ruby/Makefile.in

@@ -38,12 +38,10 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 SWIGOPT += -w801 -noautorename -features autodoc=4
 
-
+# Custom tests - tests with additional commandline options
-# Rules for the different types of tests
-
-# make sure -autorename is true for the naming test
 ruby_naming.cpptest: SWIGOPT += -autorename
 
+# Rules for the different types of tests
 %.cpptest: 
 	$(setup)
 	+$(swig_and_compile_cpp)

Examples/test-suite/tcl/Makefile.in

@@ -23,6 +23,9 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Examples/test-suite/uffi/Makefile.in

@@ -11,10 +11,14 @@ top_builddir = @top_builddir@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # no C++ tests for now
 CPP_TEST_CASES =
 #C_TEST_CASES += 
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)