diff options
Diffstat (limited to 'Examples/test-suite/common.mk')
| -rw-r--r-- | Examples/test-suite/common.mk | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 7bf8474a3..7afb55bb2 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -59,11 +59,12 @@ CXXSRCS = CSRCS = TARGETPREFIX = TARGETSUFFIX = -SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) -DSWIG_NOEXTRA_QUALIFICATION -INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +SWIGOPT = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) LIBS = -L. LIBPREFIX = lib ACTION = check +INTERFACEDIR = $(if $(wildcard $*.i), ./, ../) # # Please keep test cases in alphabetical order. @@ -76,8 +77,9 @@ CPP_TEST_BROKEN += \ cpp_broken \ exception_partial_info \ extend_variable \ + li_std_vector_ptr \ namespace_union \ - nested_comment \ + nested_struct \ overload_complicated \ template_default_pointer \ template_expr @@ -164,6 +166,7 @@ CPP_TEST_CASES += \ director_overload \ director_primitives \ director_protected \ + director_protected_overloaded \ director_redefined \ director_thread \ director_unroll \ @@ -191,6 +194,7 @@ CPP_TEST_CASES += \ fragments \ friends \ fvirtual \ + global_namespace \ global_ns_arg \ global_vars \ grouping \ @@ -205,6 +209,7 @@ CPP_TEST_CASES += \ inherit_target_language \ inherit_void_arg \ inline_initializer \ + insert_directive \ keyword_rename \ kind \ langobj \ @@ -236,10 +241,12 @@ CPP_TEST_CASES += \ namespace_typemap \ namespace_virtual_method \ naturalvar \ + nested_comment \ newobject1 \ null_pointer \ operator_overload \ operator_overload_break \ + operbool \ ordering \ overload_copy \ overload_extend \ @@ -262,6 +269,7 @@ CPP_TEST_CASES += \ rename3 \ rename4 \ rename_scope \ + rename_strip_encoder \ restrict_cplusplus \ return_const_value \ return_value_scope \ @@ -366,6 +374,7 @@ CPP_TEST_CASES += \ typemap_namespace \ typemap_ns_using \ typemap_numinputs \ + typemap_out_optimal \ typemap_variables \ typemap_various \ typename \ @@ -406,6 +415,7 @@ CPP_STD_TEST_CASES += \ template_typedef_fnc \ template_type_namespace \ template_opaque +# li_std_list ifndef SKIP_CPP_STD_CASES @@ -442,11 +452,13 @@ C_TEST_CASES += \ overload_extendc \ preproc \ ret_by_value \ + simple_array \ sizeof_pointer \ sneaky1 \ struct_rename \ typedef_struct \ typemap_subst \ + union_parameter \ unions @@ -492,14 +504,14 @@ swig_and_compile_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + 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)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT) swig_and_compile_multi_cpp = \ @@ -507,7 +519,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ done @@ -519,7 +531,7 @@ swig_and_compile_external = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_runtime = \ |