Generalized smoke test configuration.

Examples/test-suite/common.mk

@@ -97,8 +97,11 @@ CPP_TEST_BROKEN += \
 C_TEST_BROKEN += \
 	tag_no_clash_with_variable
 
+# Note: this allows to override the global list of tests for the purpose of
+# smoke testing to foster shorter test-driven development cycles
+ifndef SMOKE_TESTS_ONLY
+
 # C++ test cases. (Can be run individually using: make testcase.cpptest)
-ifndef SKIP_CPP_CASES
 CPP_TEST_CASES += \
 	abstract_access \
 	abstract_inherit \
@@ -490,7 +493,11 @@ CPP_TEST_CASES += \
 	voidtest \
 	wallkw \
 	wrapmacro
-endif
+
+endif #SMOKE_TESTS_ONLY
+
+
+ifndef SMOKE_TESTS_ONLY
 
 # C++11 test cases.
 CPP11_TEST_CASES = \
@@ -527,8 +534,12 @@ CPP11_TEST_CASES = \
 #	cpp11_result_of \             # SWIG does not support
 #	cpp11_strongly_typed_enumerations \ # SWIG not quite getting this right yet in all langs
 
+endif # SMOKE_TESTS_ONLY
+
 # Broken C++11 test cases.
-CPP11_TEST_BROKEN = 
+CPP11_TEST_BROKEN =
+
+ifndef SMOKE_TESTS_ONLY
 
 #
 # Put all the heavy STD/STL cases here, where they can be skipped if needed
@@ -554,17 +565,18 @@ CPP_STD_TEST_CASES += \
 	template_opaque
 #        li_std_list
 
+endif # SMOKE_TESTS_ONLY
 
-ifndef SKIP_CPP_STD_CASES
 CPP_TEST_CASES += ${CPP_STD_TEST_CASES}
-endif
 
 ifneq (,$(HAVE_CXX11_COMPILER))
 CPP_TEST_CASES += $(CPP11_TEST_CASES)
 endif
 
+
+ifndef SMOKE_TESTS_ONLY
+
 # C test cases. (Can be run individually using: make testcase.ctest)
-ifndef SKIP_C_CASES
 C_TEST_CASES += \
 	arrays \
 	bom_utf8 \
@@ -615,10 +627,12 @@ C_TEST_CASES += \
 	typemap_subst \
 	union_parameter \
 	unions
-endif
+
+endif # SMOKE_TESTS_ONLY
+
+ifndef SMOKE_TESTS_ONLY
 
 # Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest)
-ifndef SKIP_MULTI_CPP_CASES
 MULTI_CPP_TEST_CASES += \
 	clientdata_prop \
 	imports \
@@ -627,7 +641,8 @@ MULTI_CPP_TEST_CASES += \
 	mod \
 	template_typedef_import \
 	multi_import
-endif
+
+endif # SMOKE_TESTS_ONLY
 
 # Custom tests - tests with additional commandline options
 wallkw.cpptest: SWIGOPT += -Wallkw

Examples/test-suite/javascript/Makefile.in

@@ -15,13 +15,7 @@ else
 	JSENGINE=node
 endif
 
-# Note: the javascript generator is not ready yet for the real game.
+ifeq (1,$(SMOKE))
-# To be able keep the behavior continously tested that is expected to work already
-# we have a 'light' version of the test-suite
-# This will be removed and replaced by a list of 'BROKEN_TEST_CASES' when
-# the number gets smaller (currently we have about 65 broken tests for JSC, and 85 for V8)
-
-ifneq (,$(SMOKE))
 
 C_TEST_CASES = \
   preproc \
@@ -64,10 +58,7 @@ CPP_TEST_CASES = \
   using2 \
   javascript_unicode
 
-SKIP_CPP_CASES = @SKIP_CPP_CASES@
+SMOKE_TESTS_ONLY=1
-SKIP_C_CASES = @SKIP_C_CASES@
-SKIP_CPP_STD_CASES = @SKIP_CPP_STD_CASES@
-SKIP_MULTI_CPP_CASES = @SKIP_MULTI_CPP_CASES@
 
 endif