diff options
Diffstat (limited to 'Examples/test-suite/common.mk')
-rw-r--r-- | Examples/test-suite/common.mk | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index d81b62e5a..1658e509b 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -174,7 +174,6 @@ CPP_TEST_CASES += \ director_abstract \ director_alternating \ director_basic \ - director_property \ director_binary_string \ director_classes \ director_classic \ @@ -189,12 +188,14 @@ CPP_TEST_CASES += \ director_ignore \ director_keywords \ director_namespace_clash \ + director_nested \ director_nspace \ director_nspace_director_name_collision \ - director_nested \ director_overload \ director_overload2 \ + director_pass_by_value \ director_primitives \ + director_property \ director_protected \ director_protected_overloaded \ director_redefined \ @@ -363,6 +364,7 @@ CPP_TEST_CASES += \ smart_pointer_const2 \ smart_pointer_const_overload \ smart_pointer_extend \ + smart_pointer_ignore \ smart_pointer_member \ smart_pointer_multi \ smart_pointer_multi_typedef \ @@ -403,6 +405,7 @@ CPP_TEST_CASES += \ template_default2 \ template_default_arg \ template_default_arg_overloaded \ + template_default_arg_overloaded_extend \ template_default_arg_virtual_destructor \ template_default_class_parms \ template_default_class_parms_typedef \ @@ -671,6 +674,11 @@ MULTI_CPP_TEST_CASES += \ wallkw.cpptest: SWIGOPT += -Wallkw preproc_include.ctest: SWIGOPT += -includeall +# Allow modules to define temporarily failing tests. +C_TEST_CASES := $(filter-out $(FAILING_C_TESTS),$(C_TEST_CASES)) +CPP_TEST_CASES := $(filter-out $(FAILING_CPP_TESTS),$(CPP_TEST_CASES)) +MULTI_CPP_TEST_CASES := $(filter-out $(FAILING_MULTI_CPP_TESTS),$(MULTI_CPP_TEST_CASES)) + NOT_BROKEN_TEST_CASES = $(CPP_TEST_CASES:=.cpptest) \ $(C_TEST_CASES:=.ctest) \ @@ -701,6 +709,7 @@ all: $(NOT_BROKEN_TEST_CASES) $(BROKEN_TEST_CASES) broken: $(BROKEN_TEST_CASES) check: $(NOT_BROKEN_TEST_CASES) + @echo $(words $^) $(LANGUAGE) tests passed check-c: $(C_TEST_CASES:=.ctest) @@ -708,6 +717,13 @@ check-cpp: $(CPP_TEST_CASES:=.cpptest) check-cpp11: $(CPP11_TEST_CASES:=.cpptest) +check-failing-test = \ + $(MAKE) -s $1.$2 >/dev/null 2>/dev/null && echo "Failing test $1 passed." + +check-failing: + +-$(foreach t,$(FAILING_C_TESTS),$(call check-failing-test,$t,ctest);) + +-$(foreach t,$(FAILING_CPP_TESTS),$(call check-failing-test,$t,cpptest);) + +-$(foreach t,$(FAILING_MULTI_CPP_TESTS),$(call check-failing-test,$t,multicpptest);) endif # partialcheck target runs SWIG only, ie no compilation or running of tests (for a subset of languages) |