diff --git a/swig.spec b/swig.spec index d15950b..0896c73 100644 --- a/swig.spec +++ b/swig.spec @@ -2,6 +2,7 @@ %bcond_without testsuite %if %{without testsuite} +%global tcl 0 %global lualang 0 %global phplang 0 %global rubylang 0 @@ -49,14 +50,10 @@ %{!?golang:%global golang 0} %endif -# Tests fail with GO 1.13-beta1 -# https://github.com/swig/swig/issues/1607 -%global golang 0 - Summary: Connects C/C++/Objective C to some high-level programming languages Name: swig Version: 4.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ and BSD URL: http://swig.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz @@ -71,6 +68,10 @@ Source4: ccache-swig.csh Patch0: swig308-Do-not-use-isystem.patch # https://github.com/swig/swig/pull/1522 Patch1: swig-octave-ldflags.patch +# Fix Go tests for Go 1.13-beta1 (BZ#1736731) +Patch2: swig400-Fix-all-Go-tests-to-build-with-go-build.patch +Patch3: swig400-Restore-setting-of-GOVERSIONOPTION.patch +Patch4: swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch BuildRequires: perl-interpreter, pcre-devel %if %{python2lang} @@ -173,6 +174,9 @@ in gdb. %patch0 -p1 -b .isystem %patch1 -p1 -b .octave-ldflags +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 for all in CHANGES README; do iconv -f ISO88591 -t UTF8 < $all > $all.new @@ -203,6 +207,9 @@ done %else --without-php \ %endif +%if ! %{tcl} + --without-tcl \ +%endif %if ! %{javalang} --without-java \ %endif @@ -342,6 +349,9 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb %{_datadir}/%{name}/gdb %changelog +* Mon Aug 12 2019 Jitka Plesnikova - 4.0.0-5 +- Backport upstream fix for Go tests (BZ#1736731) + * Tue Aug 06 2019 Jitka Plesnikova - 4.0.0-4 - Disable Go tests, they fail with Go 1.13-beta diff --git a/swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch b/swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch new file mode 100644 index 0000000..11be2c5 --- /dev/null +++ b/swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch @@ -0,0 +1,54 @@ +From 62136ff782e9bf6641970f716d7d40afcf6c49ea Mon Sep 17 00:00:00 2001 +From: Ian Lance Taylor +Date: Fri, 9 Aug 2019 14:06:45 -0700 +Subject: [PATCH] Fix Go version check and Go in-tree example tests + +Fixes #1607 +--- + Examples/Makefile.in | 4 ++-- + configure.ac | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Examples/Makefile.in b/Examples/Makefile.in +index 9e05d2763..6fbca29db 100644 +--- a/Examples/Makefile.in ++++ b/Examples/Makefile.in +@@ -1484,7 +1484,7 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + rm -f gopath/$(GOMOD)/src/runme/*; \ + fi + if test -f $(SRCDIR)$(RUNME).go; then \ +- cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \ ++ cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \ + fi + GOPATH=`pwd`/gopath/$(GOMOD); \ + export GOPATH; \ +@@ -1533,7 +1533,7 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + rm -f gopath/$(GOMOD)/src/runme/*; \ + fi + if test -f $(SRCDIR)$(RUNME).go; then \ +- cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \ ++ cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \ + fi + GOPATH=`pwd`/gopath/$(GOMOD); \ + export GOPATH; \ +diff --git a/configure.ac b/configure.ac +index 73c38a72c..63509cd66 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2391,10 +2391,11 @@ else + + if test -n "$GO" ; then + GOVERSIONOPTION=version ++ go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //') + AC_MSG_CHECKING([whether go version is too old]) + case $go_version in +- go1.[012345]*) +- AC_MSG_RESULT([yes - minimum version is 1.6]) ++ go1.[012]*) ++ AC_MSG_RESULT([yes - minimum version is 1.3]) + GO= + GOOPT="-intgosize 32" + ;; +-- +2.20.1 + diff --git a/swig400-Fix-all-Go-tests-to-build-with-go-build.patch b/swig400-Fix-all-Go-tests-to-build-with-go-build.patch new file mode 100644 index 0000000..861160d --- /dev/null +++ b/swig400-Fix-all-Go-tests-to-build-with-go-build.patch @@ -0,0 +1,2648 @@ +From 7aafe3d8b2c8b138c431d5fcc98a4d2a7c3270f9 Mon Sep 17 00:00:00 2001 +From: Ian Lance Taylor +Date: Thu, 8 Aug 2019 14:30:50 -0700 +Subject: [PATCH 1/2] Fix all Go tests to build with "go build" + +Tested against Go 1.6 through Go 1.13beta1, and gccgo. + +Fixes #1607 +--- + Examples/Makefile.in | 154 ++++-------------- + Examples/go/callback/runme.go | 2 +- + Examples/go/class/runme.go | 2 +- + Examples/go/constants/runme.go | 2 +- + Examples/go/director/runme.go | 2 +- + Examples/go/enum/runme.go | 2 +- + Examples/go/extend/runme.go | 2 +- + Examples/go/funcptr/runme.go | 2 +- + Examples/go/multimap/runme.go | 2 +- + Examples/go/pointer/runme.go | 2 +- + Examples/go/reference/runme.go | 2 +- + Examples/go/simple/runme.go | 2 +- + Examples/go/template/runme.go | 2 +- + Examples/go/variables/runme.go | 2 +- + Examples/test-suite/go/Makefile.in | 118 ++++++-------- + .../test-suite/go/abstract_access_runme.go | 2 +- + .../test-suite/go/abstract_typedef2_runme.go | 2 +- + .../test-suite/go/abstract_typedef_runme.go | 2 +- + .../test-suite/go/abstract_virtual_runme.go | 2 +- + Examples/test-suite/go/argout_runme.go | 2 +- + Examples/test-suite/go/array_member_runme.go | 2 +- + Examples/test-suite/go/arrays_global_runme.go | 2 +- + Examples/test-suite/go/char_binary_runme.go | 2 +- + Examples/test-suite/go/class_ignore_runme.go | 2 +- + .../test-suite/go/class_scope_weird_runme.go | 2 +- + .../test-suite/go/compactdefaultargs_runme.go | 2 +- + Examples/test-suite/go/constover_runme.go | 2 +- + .../test-suite/go/constructor_copy_runme.go | 2 +- + Examples/test-suite/go/contract_runme.go | 2 +- + ...cpp11_strongly_typed_enumerations_runme.go | 2 +- + Examples/test-suite/go/cpp_enum_runme.go | 2 +- + Examples/test-suite/go/cpp_namespace_runme.go | 2 +- + Examples/test-suite/go/cpp_static_runme.go | 2 +- + Examples/test-suite/go/default_args_runme.go | 2 +- + .../go/default_constructor_runme.go | 2 +- + .../go/director_alternating_runme.go | 2 +- + .../test-suite/go/director_basic_runme.go | 2 +- + .../test-suite/go/director_classic_runme.go | 2 +- + .../test-suite/go/director_default_runme.go | 2 +- + .../test-suite/go/director_detect_runme.go | 2 +- + Examples/test-suite/go/director_enum_runme.go | 2 +- + .../test-suite/go/director_exception_runme.go | 2 +- + .../test-suite/go/director_extend_runme.go | 2 +- + .../test-suite/go/director_finalizer_runme.go | 2 +- + Examples/test-suite/go/director_frob_runme.go | 2 +- + .../test-suite/go/director_nested_runme.go | 2 +- + .../test-suite/go/director_profile_runme.go | 2 +- + .../test-suite/go/director_protected_runme.go | 2 +- + .../test-suite/go/director_string_runme.go | 2 +- + .../test-suite/go/director_unroll_runme.go | 2 +- + Examples/test-suite/go/disown_runme.go | 2 +- + Examples/test-suite/go/dynamic_cast_runme.go | 2 +- + Examples/test-suite/go/empty_c_runme.go | 2 +- + Examples/test-suite/go/empty_runme.go | 2 +- + Examples/test-suite/go/enum_template_runme.go | 2 +- + Examples/test-suite/go/enums_runme.go | 2 +- + .../test-suite/go/exception_order_runme.go | 2 +- + .../test-suite/go/extend_placement_runme.go | 2 +- + .../test-suite/go/extend_template_ns_runme.go | 2 +- + .../test-suite/go/extend_template_runme.go | 2 +- + .../test-suite/go/extend_variable_runme.go | 2 +- + Examples/test-suite/go/extern_c_runme.go | 2 +- + Examples/test-suite/go/friends_runme.go | 2 +- + Examples/test-suite/go/fvirtual_runme.go | 2 +- + Examples/test-suite/go/global_ns_arg_runme.go | 2 +- + .../test-suite/go/go_director_inout_runme.go | 2 +- + Examples/test-suite/go/go_inout_runme.go | 2 +- + Examples/test-suite/go/grouping_runme.go | 2 +- + .../test-suite/go/import_nomodule_runme.go | 2 +- + Examples/test-suite/go/inctest_runme.go | 2 +- + .../test-suite/go/inherit_member_runme.go | 2 +- + .../test-suite/go/inherit_missing_runme.go | 2 +- + Examples/test-suite/go/input_runme.go | 2 +- + .../test-suite/go/keyword_rename_c_runme.go | 2 +- + .../test-suite/go/keyword_rename_runme.go | 2 +- + Examples/test-suite/go/li_attribute_runme.go | 2 +- + .../test-suite/go/li_carrays_cpp_runme.go | 2 +- + Examples/test-suite/go/li_carrays_runme.go | 2 +- + Examples/test-suite/go/li_cdata_cpp_runme.go | 2 +- + Examples/test-suite/go/li_cdata_runme.go | 2 +- + Examples/test-suite/go/li_cmalloc_runme.go | 2 +- + .../test-suite/go/li_cpointer_cpp_runme.go | 2 +- + Examples/test-suite/go/li_cpointer_runme.go | 2 +- + Examples/test-suite/go/li_std_map_runme.go | 2 +- + .../test-suite/go/li_std_vector_ptr_runme.go | 2 +- + .../test-suite/go/member_pointer_runme.go | 2 +- + .../test-suite/go/memberin_extend_c_runme.go | 2 +- + Examples/test-suite/go/minherit_runme.go | 2 +- + .../test-suite/go/namespace_class_runme.go | 2 +- + .../test-suite/go/namespace_typemap_runme.go | 2 +- + .../go/namespace_virtual_method_runme.go | 2 +- + Examples/test-suite/go/naturalvar_runme.go | 2 +- + .../test-suite/go/nested_workaround_runme.go | 2 +- + .../go/overload_complicated_runme.go | 2 +- + Examples/test-suite/go/overload_copy_runme.go | 2 +- + .../test-suite/go/overload_extend2_runme.go | 2 +- + .../test-suite/go/overload_extend_c_runme.go | 2 +- + .../test-suite/go/overload_extend_runme.go | 2 +- + .../go/overload_polymorphic_runme.go | 2 +- + .../test-suite/go/overload_rename_runme.go | 2 +- + .../test-suite/go/overload_simple_runme.go | 2 +- + .../test-suite/go/overload_subtype_runme.go | 2 +- + .../go/overload_template_fast_runme.go | 2 +- + .../test-suite/go/overload_template_runme.go | 2 +- + Examples/test-suite/go/preproc_runme.go | 2 +- + Examples/test-suite/go/primitive_ref_runme.go | 2 +- + Examples/test-suite/go/profiletest_runme.go | 2 +- + Examples/test-suite/go/refcount_runme.go | 2 +- + .../go/reference_global_vars_runme.go | 2 +- + Examples/test-suite/go/rename_scope_runme.go | 2 +- + Examples/test-suite/go/rename_simple_runme.go | 2 +- + .../go/rename_strip_encoder_runme.go | 2 +- + Examples/test-suite/go/ret_by_value_runme.go | 2 +- + .../test-suite/go/return_const_value_runme.go | 2 +- + .../go/smart_pointer_extend_runme.go | 2 +- + .../go/smart_pointer_member_runme.go | 2 +- + .../go/smart_pointer_multi_runme.go | 2 +- + .../go/smart_pointer_multi_typedef_runme.go | 2 +- + .../go/smart_pointer_overload_runme.go | 2 +- + .../go/smart_pointer_rename_runme.go | 2 +- + .../go/smart_pointer_simple_runme.go | 2 +- + .../smart_pointer_templatevariables_runme.go | 2 +- + .../go/smart_pointer_typedef_runme.go | 2 +- + Examples/test-suite/go/sneaky1_runme.go | 2 +- + .../go/special_variable_macros_runme.go | 2 +- + .../go/static_const_member_2_runme.go | 2 +- + .../go/struct_initialization_runme.go | 2 +- + Examples/test-suite/go/struct_rename_runme.go | 2 +- + Examples/test-suite/go/struct_value_runme.go | 2 +- + .../go/template_default_arg_runme.go | 2 +- + .../test-suite/go/template_extend1_runme.go | 2 +- + .../test-suite/go/template_extend2_runme.go | 2 +- + .../test-suite/go/template_inherit_runme.go | 2 +- + Examples/test-suite/go/template_ns4_runme.go | 2 +- + Examples/test-suite/go/template_ns_runme.go | 2 +- + .../test-suite/go/template_opaque_runme.go | 2 +- + .../test-suite/go/template_ref_type_runme.go | 2 +- + .../test-suite/go/template_rename_runme.go | 2 +- + .../test-suite/go/template_static_runme.go | 2 +- + .../go/template_tbase_template_runme.go | 2 +- + .../go/template_type_namespace_runme.go | 2 +- + .../go/template_typedef_cplx3_runme.go | 2 +- + .../go/template_typedef_cplx4_runme.go | 2 +- + .../test-suite/go/threads_exception_runme.go | 2 +- + Examples/test-suite/go/typedef_class_runme.go | 2 +- + .../test-suite/go/typedef_funcptr_runme.go | 2 +- + .../test-suite/go/typedef_inherit_runme.go | 2 +- + Examples/test-suite/go/typedef_scope_runme.go | 2 +- + .../test-suite/go/typemap_namespace_runme.go | 2 +- + .../test-suite/go/typemap_ns_using_runme.go | 2 +- + .../go/typemap_out_optimal_runme.go | 2 +- + Examples/test-suite/go/typename_runme.go | 2 +- + Examples/test-suite/go/unions_runme.go | 2 +- + Examples/test-suite/go/using1_runme.go | 2 +- + Examples/test-suite/go/using2_runme.go | 2 +- + .../test-suite/go/using_composition_runme.go | 2 +- + Examples/test-suite/go/using_extend_runme.go | 2 +- + Examples/test-suite/go/using_inherit_runme.go | 2 +- + Examples/test-suite/go/using_private_runme.go | 2 +- + .../test-suite/go/using_protected_runme.go | 2 +- + .../test-suite/go/varargs_overload_runme.go | 2 +- + Examples/test-suite/go/varargs_runme.go | 2 +- + .../test-suite/go/virtual_derivation_runme.go | 2 +- + Examples/test-suite/go/virtual_poly_runme.go | 2 +- + Examples/test-suite/go/voidtest_runme.go | 2 +- + Examples/test-suite/go/wrapmacro_runme.go | 2 +- + configure.ac | 38 +---- + 167 files changed, 246 insertions(+), 392 deletions(-) + +diff --git a/Examples/Makefile.in b/Examples/Makefile.in +index 98be7873f..9e05d2763 100644 +--- a/Examples/Makefile.in ++++ b/Examples/Makefile.in +@@ -1436,34 +1436,20 @@ scilab_clean: + GO = @GO@ + GOGCC = @GOGCC@ + GCCGO = @GCCGO@ +-GO1 = @GO1@ +-GO12 = @GO12@ +-GO13 = @GO13@ +-GO15 = @GO15@ +-GOC = @GOC@ + GOOPT = @GOOPT@ + GCCGOOPT = @GCCGOOPT@ + GOVERSIONOPTION = @GOVERSIONOPTION@ + + GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi` +-GOCOMPILEARG = `if $(GO15); then echo tool compile; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) || $(GO15); then echo -pack ; fi` + + GOSRCS = $(INTERFACE:.i=.go) + GOCSRCS = $(INTERFACE:.i=_gc.c) + +-GOLD = `if $(GO15); then echo link; else echo $(GOC:c=l); fi` +-GOTOOL = `if $(GO1) ; then echo go tool; fi` +-GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi` +- + GOPACKAGE = $(notdir $(INTERFACE:.i=.a)) + + GOPATHPARENTDIR = gopath/$(GOMOD)/src + GOPATHDIR = $(GOPATHPARENTDIR)/$(INTERFACE:.i=) + +-GOOBJEXT = `if $(GO15); then echo o; else echo $(GOC:c=); fi` +-GOGCOBJS = $(GOSRCS:.go=.$(GOOBJEXT)) +-GOGCCOBJS = $(GOSRCS:.go=.@OBJEXT@) +- + # ---------------------------------------------------------------- + # Build a Go module (C) + # ---------------------------------------------------------------- +@@ -1478,49 +1464,13 @@ $(GOPATHPARENTDIR)/go.mod: + echo "go 1.12" >> $(GOPATHDIR)/go.mod + mv -f $(GOPATHDIR)/go.mod $(GOPATHPARENTDIR)/go.mod + +-go_nocgo: $(SRCDIR_SRCS) +- $(SWIG) -go -no-cgo $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH) +- if $(GO12) || $(GO13) || $(GO15) || $(GOGCC); then \ +- $(CC) -g -c $(CPPFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES); \ +- else \ +- $(CC) -g -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES); \ +- $(LDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \ +- fi +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -g -c -I . $(GOSRCS); \ +- else \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(GOSRCS); \ +- $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} $(GOCSRCS); \ +- rm -f $(GOPACKAGE); \ +- if $(GO13) || $(GO15); then \ +- cp $(GOGCOBJS) $(GOPACKAGE); \ +- $(COMPILETOOL) $(GOPACK) r $(GOPACKAGE) $(GOCSRCS:.c=.$(GOOBJEXT)) $(OBJS) $(IOBJS); \ +- elif $(GO12); then \ +- $(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)) $(OBJS) $(IOBJS); \ +- else \ +- $(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \ +- fi; \ +- fi +- if test -f $(SRCDIR)$(RUNME).go; then \ +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOGCCOBJS) $(OBJS) $(IOBJS); \ +- elif $(GO12) || $(GO13) || $(GO15); then \ +- $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- else \ +- $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- fi; \ +- fi +- + go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + $(SWIG) -go -import-prefix swigtests $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH) + @mkdir gopath 2>/dev/null || true + @mkdir gopath/$(GOMOD) 2>/dev/null || true + @mkdir gopath/$(GOMOD)/src 2>/dev/null || true + @mkdir $(GOPATHDIR) 2>/dev/null || true +- rm -f $(GOPATHDIR)/* ++ rm -rf $(GOPATHDIR)/* + cp $(ISRCS) $(GOPATHDIR)/ + if test -f $(IWRAP:.i=.h); then \ + cp $(IWRAP:.i=.h) $(GOPATHDIR)/; \ +@@ -1529,6 +1479,13 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + cp $(SRCDIR_SRCS) $(GOPATHDIR)/; \ + fi + cp $(GOSRCS) $(GOPATHDIR)/ ++ @if test -f $(SRCDIR)$(RUNME).go; then \ ++ mkdir gopath/$(GOMOD)/src/runme 2>/dev/null || true; \ ++ rm -f gopath/$(GOMOD)/src/runme/*; \ ++ fi ++ if test -f $(SRCDIR)$(RUNME).go; then \ ++ cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \ ++ fi + GOPATH=`pwd`/gopath/$(GOMOD); \ + export GOPATH; \ + CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `cd $(SRCDIR) && pwd` -I `pwd`"; \ +@@ -1537,82 +1494,29 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + export CGO_CFLAGS; \ + CGO_LDFLAGS="$(LDFLAGS) -lm"; \ + export CGO_LDFLAGS; \ +- (cd $(GOPATHDIR)/ && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o $(GOPACKAGE)) ++ (cd $(GOPATHDIR)/ && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o $(GOPACKAGE)); \ + if $(GOGCC); then \ + cp $(GOPATHDIR)/$(GOPACKAGE) $(GOPATHDIR)/$(GOPACKAGE:.a=.gox); \ +- fi ++ fi; \ + if test -f $(SRCDIR)$(RUNME).go; then \ +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -c -g -I $(GOPATHDIR) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOPATHDIR)/$(GOPACKAGE); \ +- elif $(GO12) || $(GO13) || $(GO15); then \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I $(GOPATHDIR) -o $(RUNME).$(GOOBJEXT) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -L $(GOPATHDIR) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- else \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- fi; \ ++ mkdir gopath/$(GOMOD)/src/swigtests 2>/dev/null || true; \ ++ mkdir gopath/$(GOMOD)/src/swigtests/$(INTERFACE:.i=) 2>/dev/null || true; \ ++ cp $(GOPATHDIR)/* gopath/$(GOMOD)/src/swigtests/$(INTERFACE:.i=)/; \ ++ (cd gopath/$(GOMOD)/src/runme && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o runme $(RUNME).go); \ ++ cp gopath/$(GOMOD)/src/runme/runme $(RUNME); \ + fi + + # ---------------------------------------------------------------- + # Build a Go module (C++) + # ---------------------------------------------------------------- + +-go_cpp_nocgo: $(SRCDIR_SRCS) +- $(SWIG) -go -c++ -no-cgo $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH) +- if $(GO12) || $(GO13) || $(GO15) || $(GOGCC); then \ +- if test -n "$(SRCDIR_CXXSRCS)$(SRCDIR_SRCS)"; then \ +- $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \ +- fi; \ +- $(foreach f,$(ICXXSRCS), \ +- $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o $(addsuffix .@OBJEXT@,$(basename $f)) $f $(INCLUDES); \ +- ) \ +- else \ +- $(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \ +- $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \ +- fi +- if ! $(GOGCC) ; then \ +- $(foreach f,$(GOSRCS), \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f \ +- ); \ +- $(foreach f,$(GOCSRCS), \ +- $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} \ +- -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f; \ +- ) \ +- rm -f $(GOPACKAGE); \ +- if $(GO13) || $(GO15); then \ +- cp $(GOGCOBJS) $(GOPACKAGE); \ +- $(COMPILETOOL) $(GOPACK) r $(GOPACKAGE) $(GOCSRCS:.c=.$(GOOBJEXT)) $(OBJS) $(IOBJS); \ +- elif $(GO12); then \ +- $(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)) $(OBJS) $(IOBJS); \ +- else \ +- $(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \ +- fi; \ +- else \ +- $(foreach f,$(GOSRCS), \ +- $(COMPILETOOL) $(GCCGO) -g -c -I . -o $(addsuffix .@OBJEXT@,$(basename $f)) $f \ +- ); \ +- fi +- if test -f $(SRCDIR)$(RUNME).go; then \ +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOGCCOBJS) $(OBJS) $(IOBJS) -lstdc++; \ +- elif $(GO12) || $(GO13) || $(GO15); then \ +- $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- else \ +- $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- fi; \ +- fi +- + go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + $(SWIG) -go -c++ -import-prefix swigtests $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH) + @mkdir gopath 2>/dev/null || true + @mkdir gopath/$(GOMOD) 2>/dev/null || true + @mkdir gopath/$(GOMOD)/src 2>/dev/null || true + @mkdir $(GOPATHDIR) 2>/dev/null || true +- rm -f $(GOPATHDIR)/* ++ rm -rf $(GOPATHDIR)/* + cp $(ICXXSRCS) $(GOPATHDIR)/ + if test -f $(IWRAP:.i=.h); then \ + cp $(IWRAP:.i=.h) $(GOPATHDIR)/; \ +@@ -1624,6 +1528,13 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + cp $(SRCDIR_SRCS) $(GOPATHDIR)/; \ + fi + cp $(GOSRCS) $(GOPATHDIR)/ ++ @if test -f $(SRCDIR)$(RUNME).go; then \ ++ mkdir gopath/$(GOMOD)/src/runme 2>/dev/null || true; \ ++ rm -f gopath/$(GOMOD)/src/runme/*; \ ++ fi ++ if test -f $(SRCDIR)$(RUNME).go; then \ ++ cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \ ++ fi + GOPATH=`pwd`/gopath/$(GOMOD); \ + export GOPATH; \ + CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `cd $(SRCDIR) && pwd` -I `pwd`"; \ +@@ -1634,21 +1545,16 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod + export CGO_CXXFLAGS; \ + CGO_LDFLAGS="$(LDFLAGS) -lm"; \ + export CGO_LDFLAGS; \ +- (cd $(GOPATHDIR) && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o $(GOPACKAGE)) ++ (cd $(GOPATHDIR) && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o $(GOPACKAGE)); \ + if $(GOGCC); then \ + cp $(GOPATHDIR)/$(GOPACKAGE) $(GOPATHDIR)/$(GOPACKAGE:.a=.gox); \ +- fi ++ fi; \ + if test -f $(SRCDIR)$(RUNME).go; then \ +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -g -c -I $(GOPATHDIR) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOPATHDIR)/$(GOPACKAGE) -lstdc++; \ +- elif $(GO12) || $(GO13) || $(GO15); then \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I $(GOPATHDIR) -o $(RUNME).$(GOOBJEXT) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -L $(GOPATHDIR) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- else \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \ +- fi; \ ++ mkdir gopath/$(GOMOD)/src/swigtests 2>/dev/null || true; \ ++ mkdir gopath/$(GOMOD)/src/swigtests/$(INTERFACE:.i=) 2>/dev/null || true; \ ++ cp $(GOPATHDIR)/* gopath/$(GOMOD)/src/swigtests/$(INTERFACE:.i=)/; \ ++ (cd gopath/$(GOMOD)/src/runme && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o runme $(RUNME).go); \ ++ cp gopath/$(GOMOD)/src/runme/runme $(RUNME); \ + fi + + # ----------------------------------------------------------------- +diff --git a/Examples/go/callback/runme.go b/Examples/go/callback/runme.go +index 2c1d81343..7c9ffd681 100644 +--- a/Examples/go/callback/runme.go ++++ b/Examples/go/callback/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/class/runme.go b/Examples/go/class/runme.go +index d2f292ed4..a09a18247 100644 +--- a/Examples/go/class/runme.go ++++ b/Examples/go/class/runme.go +@@ -5,7 +5,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/constants/runme.go b/Examples/go/constants/runme.go +index d56fd62c8..57ef21a8b 100644 +--- a/Examples/go/constants/runme.go ++++ b/Examples/go/constants/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- "example" ++ "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/director/runme.go b/Examples/go/director/runme.go +index 0e0da07bd..e28eccba6 100644 +--- a/Examples/go/director/runme.go ++++ b/Examples/go/director/runme.go +@@ -4,7 +4,7 @@ import ( + "fmt" + "os" + +- "example" ++ "swigtests/example" + ) + + func Compare(name string, got string, exp string) error { +diff --git a/Examples/go/enum/runme.go b/Examples/go/enum/runme.go +index 50887056e..c0642e0b5 100644 +--- a/Examples/go/enum/runme.go ++++ b/Examples/go/enum/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/extend/runme.go b/Examples/go/extend/runme.go +index af64a6e5d..716af52c5 100644 +--- a/Examples/go/extend/runme.go ++++ b/Examples/go/extend/runme.go +@@ -5,7 +5,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/funcptr/runme.go b/Examples/go/funcptr/runme.go +index 4b20db4fb..87ec7d495 100644 +--- a/Examples/go/funcptr/runme.go ++++ b/Examples/go/funcptr/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/multimap/runme.go b/Examples/go/multimap/runme.go +index 571fac7c2..2f8b20568 100644 +--- a/Examples/go/multimap/runme.go ++++ b/Examples/go/multimap/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/pointer/runme.go b/Examples/go/pointer/runme.go +index 0cf340f51..73c6b2b3c 100644 +--- a/Examples/go/pointer/runme.go ++++ b/Examples/go/pointer/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/reference/runme.go b/Examples/go/reference/runme.go +index 9999733b3..7391d9c8b 100644 +--- a/Examples/go/reference/runme.go ++++ b/Examples/go/reference/runme.go +@@ -5,7 +5,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/simple/runme.go b/Examples/go/simple/runme.go +index 0bd4657f9..5bc055f2e 100644 +--- a/Examples/go/simple/runme.go ++++ b/Examples/go/simple/runme.go +@@ -3,7 +3,7 @@ package main + import ( + "fmt" + +- "example" ++ "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/template/runme.go b/Examples/go/template/runme.go +index 347795377..e000b1579 100644 +--- a/Examples/go/template/runme.go ++++ b/Examples/go/template/runme.go +@@ -5,7 +5,7 @@ package main + import ( + "fmt" + +- . "example" ++ . "swigtests/example" + ) + + func main() { +diff --git a/Examples/go/variables/runme.go b/Examples/go/variables/runme.go +index e2dd0c67f..85ca8c638 100644 +--- a/Examples/go/variables/runme.go ++++ b/Examples/go/variables/runme.go +@@ -5,7 +5,7 @@ package main + import ( + "fmt" + +- "example" ++ "swigtests/example" + ) + + func main() { +diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in +index d07a56bec..8283327d6 100644 +--- a/Examples/test-suite/go/Makefile.in ++++ b/Examples/test-suite/go/Makefile.in +@@ -6,24 +6,10 @@ LANGUAGE = go + GO = @GO@ + GOGCC = @GOGCC@ + GCCGO = @GCCGO@ +-GO1 = @GO1@ +-GO12 = @GO12@ +-GO13 = @GO13@ +-GO15 = @GO15@ +-GOC = @GOC@ + GOVERSIONOPTION = @GOVERSIONOPTION@ + host = @host@ + SCRIPTSUFFIX = _runme.go + +-GOCOMPILEARG = `if $(GO15); then echo tool compile; elif $(GO1); then echo tool $(GOC:c=g); fi` +-GOLD = `if $(GO15); then echo link; else echo $(GOC:c=l); fi` +-GOTOOL = `if $(GO1) ; then echo go tool; fi` +-GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi` +- +-GOOBJEXT = `if $(GO15); then echo o; else echo $(GOC:c=); fi` +- +-OSXOLDGOLINKFLAGS = `if [ -n "\`$(GO) $(GOVERSIONOPTION) | grep -E 'go1($|.0|.1|.2|.3)'\`" ] && [ -n "\`echo $(host) | grep darwin\`" ]; then echo "-Wl,-U,__cgo_topofstack"; fi` +- + SO = @SO@ + + srcdir = @srcdir@ +@@ -49,27 +35,11 @@ INCLUDES = -I$(abs_top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) + $(setup) + +$(swig_and_compile_cpp) + $(run_testcase_cpp) +- if ! $(GO15); then \ +- $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ +- SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ +- INCLUDES='$(INCLUDES)' SWIGOPT='$(SWIGOPT)' NOLINK=true \ +- TARGET='$(TARGETPREFIX)$*$(TARGETSUFFIX)' INTERFACEDIR='$(INTERFACEDIR)' INTERFACE='$*.i' \ +- $(LANGUAGE)$(VARIANT)_cpp_nocgo && \ +- $(run_testcase_cpp); \ +- fi + + %.ctest: + $(setup) + +$(swig_and_compile_c) + $(run_testcase) +- if ! $(GO15); then \ +- $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR='$(SRCDIR)' CSRCS='$(CSRCS)' \ +- SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ +- INCLUDES='$(INCLUDES)' SWIGOPT='$(SWIGOPT)' NOLINK=true \ +- TARGET='$(TARGETPREFIX)$*$(TARGETSUFFIX)' INTERFACEDIR='$(INTERFACEDIR)' INTERFACE='$*.i' \ +- $(LANGUAGE)$(VARIANT)_nocgo && \ +- $(run_testcase); \ +- fi + + %.multicpptest: + $(setup) +@@ -136,54 +106,66 @@ go_subdir_import.multicpptest: + # Runs the testcase. + run_testcase = \ + if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \ +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -c -g -I gopath/src/$* $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ +- $(COMPILETOOL) $(GCCGO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ gopath/src/$*/$*.a; \ +- elif $(GO12) || $(GO13) || $(GO15); then \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I gopath/src/$* $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -L gopath/src/$* -linkmode external -extld $(CC) -extldflags "$(CFLAGS) $(OSXOLDGOLINKFLAGS)" -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \ +- else \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -L . -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \ +- fi && \ ++ GOPATH=`pwd`/gopath/; \ ++ export GOPATH; \ ++ CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `cd $(SRCDIR) && pwd` -I `pwd`"; \ ++ export CGO_CPPFLAGS; \ ++ CGO_CFLAGS="$(CFLAGS)"; \ ++ export CGO_CFLAGS; \ ++ CGO_CXXFLAGS="$(CXXFLAGS)"; \ ++ export CGO_CXXFLAGS; \ ++ CGO_LDFLAGS="$(LDFLAGS) -lm"; \ ++ export CGO_LDFLAGS; \ ++ mkdir gopath/src/swigtests 2>/dev/null || true; \ ++ mkdir gopath/src/swigtests/$* 2>/dev/null || true; \ ++ cp gopath/src/$*/* gopath/src/swigtests/$*/; \ ++ mkdir gopath/src/$*/runme 2>/dev/null || true; \ ++ cp $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) gopath/src/$*/runme/runme.go; \ ++ (cd gopath/src/$*/runme && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o runme runme.go); \ ++ cp gopath/src/$*/runme/runme $*_runme; \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \ + fi + + run_testcase_cpp = \ + if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \ +- if $(GOGCC) ; then \ +- $(COMPILETOOL) $(GCCGO) -c -g -I gopath/src/$* $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ +- $(COMPILETOOL) $(GCCGO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ gopath/src/$*/$*.a -lstdc++; \ +- elif $(GO12) || $(GO13) || $(GO15); then \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I gopath/src/$* $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -L gopath/src/$* -linkmode external -extld $(CXX) -extldflags "$(CXXFLAGS) $(OSXOLDGOLINKFLAGS)" -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \ +- else \ +- $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ +- $(COMPILETOOL) $(GOTOOL) $(GOLD) -L . -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \ +- fi && \ ++ GOPATH=`pwd`/gopath/; \ ++ export GOPATH; \ ++ CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `cd $(SRCDIR) && pwd` -I `pwd`"; \ ++ export CGO_CPPFLAGS; \ ++ CGO_CFLAGS="$(CFLAGS)"; \ ++ export CGO_CFLAGS; \ ++ CGO_CXXFLAGS="$(CXXFLAGS)"; \ ++ export CGO_CXXFLAGS; \ ++ CGO_LDFLAGS="$(LDFLAGS) -lm"; \ ++ export CGO_LDFLAGS; \ ++ mkdir gopath/src/swigtests 2>/dev/null || true; \ ++ mkdir gopath/src/swigtests/$* 2>/dev/null || true; \ ++ cp gopath/src/$*/* gopath/src/swigtests/$*/; \ ++ mkdir gopath/src/$*/runme 2>/dev/null || true; \ ++ cp $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) gopath/src/$*/runme/runme.go; \ ++ (cd gopath/src/$*/runme && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o runme runme.go); \ ++ cp gopath/src/$*/runme/runme $*_runme; \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \ + fi + + run_multi_testcase = \ + if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \ +- if $(GO15) || $(GOGCC); then \ +- files=`cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list`; \ +- mkdir gopath/$*/src/$* 2>/dev/null || true; \ +- cp $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) gopath/$*/src/$*; \ +- GOPATH="`pwd`/gopath/$*"; \ +- export GOPATH; \ +- CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) `for f in $$files; do echo -I ../$$f; done`"; \ +- export CGO_CPPFLAGS; \ +- CGO_CFLAGS="$(CFLAGS)"; \ +- export CGO_CFLAGS; \ +- CGO_CXXFLAGS="$(CXXFLAGS)"; \ +- export CGO_CXXFLAGS; \ +- CGO_LDFLAGS="$(LDFLAGS) -lm"; \ +- export CGO_LDFLAGS; \ +- (cd gopath/$*/src/$* && \ +- $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o ../../../../$*_runme) && \ +- env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \ +- fi; \ ++ files=`cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list`; \ ++ mkdir gopath/$*/src/$* 2>/dev/null || true; \ ++ cp $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) gopath/$*/src/$*; \ ++ GOPATH="`pwd`/gopath/$*"; \ ++ export GOPATH; \ ++ CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) `for f in $$files; do echo -I ../$$f; done`"; \ ++ export CGO_CPPFLAGS; \ ++ CGO_CFLAGS="$(CFLAGS)"; \ ++ export CGO_CFLAGS; \ ++ CGO_CXXFLAGS="$(CXXFLAGS)"; \ ++ export CGO_CXXFLAGS; \ ++ CGO_LDFLAGS="$(LDFLAGS) -lm"; \ ++ export CGO_LDFLAGS; \ ++ (cd gopath/$*/src/$* && \ ++ $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o ../../../../$*_runme) && \ ++ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \ + fi + + %.clean: +diff --git a/Examples/test-suite/go/abstract_access_runme.go b/Examples/test-suite/go/abstract_access_runme.go +index 5102236f9..0a0e56fef 100644 +--- a/Examples/test-suite/go/abstract_access_runme.go ++++ b/Examples/test-suite/go/abstract_access_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "abstract_access" ++import "swigtests/abstract_access" + + func main() { + d := abstract_access.NewD() +diff --git a/Examples/test-suite/go/abstract_typedef2_runme.go b/Examples/test-suite/go/abstract_typedef2_runme.go +index 76a5fc8de..5e2ed1e7a 100644 +--- a/Examples/test-suite/go/abstract_typedef2_runme.go ++++ b/Examples/test-suite/go/abstract_typedef2_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "abstract_typedef2" ++import "swigtests/abstract_typedef2" + + func main() { + abstract_typedef2.NewA_UF() +diff --git a/Examples/test-suite/go/abstract_typedef_runme.go b/Examples/test-suite/go/abstract_typedef_runme.go +index 56aaa613f..1ad49f59d 100644 +--- a/Examples/test-suite/go/abstract_typedef_runme.go ++++ b/Examples/test-suite/go/abstract_typedef_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "abstract_typedef" ++import "swigtests/abstract_typedef" + + func main() { + e := abstract_typedef.NewEngine() +diff --git a/Examples/test-suite/go/abstract_virtual_runme.go b/Examples/test-suite/go/abstract_virtual_runme.go +index e19eac27d..d333d50b3 100644 +--- a/Examples/test-suite/go/abstract_virtual_runme.go ++++ b/Examples/test-suite/go/abstract_virtual_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "abstract_virtual" ++import "swigtests/abstract_virtual" + + func main() { + abstract_virtual.NewD() +diff --git a/Examples/test-suite/go/argout_runme.go b/Examples/test-suite/go/argout_runme.go +index bb8ab9ed2..b2edf54b6 100644 +--- a/Examples/test-suite/go/argout_runme.go ++++ b/Examples/test-suite/go/argout_runme.go +@@ -1,6 +1,6 @@ + package main + +-import wrap "argout" ++import wrap "swigtests/argout" + + func main() { + ip := wrap.New_intp() +diff --git a/Examples/test-suite/go/array_member_runme.go b/Examples/test-suite/go/array_member_runme.go +index 4f029db98..d8c3896ee 100644 +--- a/Examples/test-suite/go/array_member_runme.go ++++ b/Examples/test-suite/go/array_member_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "array_member" ++import . "swigtests/array_member" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/arrays_global_runme.go b/Examples/test-suite/go/arrays_global_runme.go +index 35b049d9a..9c4a9e57a 100644 +--- a/Examples/test-suite/go/arrays_global_runme.go ++++ b/Examples/test-suite/go/arrays_global_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "arrays_global" ++import . "swigtests/arrays_global" + + func main() { + SetArray_i(GetArray_const_i()) +diff --git a/Examples/test-suite/go/char_binary_runme.go b/Examples/test-suite/go/char_binary_runme.go +index d47d616af..3c8c2d72d 100644 +--- a/Examples/test-suite/go/char_binary_runme.go ++++ b/Examples/test-suite/go/char_binary_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "char_binary" ++import . "swigtests/char_binary" + + func main() { + t := NewTest() +diff --git a/Examples/test-suite/go/class_ignore_runme.go b/Examples/test-suite/go/class_ignore_runme.go +index 24261c637..11cf81d91 100644 +--- a/Examples/test-suite/go/class_ignore_runme.go ++++ b/Examples/test-suite/go/class_ignore_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "class_ignore" ++import "swigtests/class_ignore" + + func main() { + a := class_ignore.NewBar() +diff --git a/Examples/test-suite/go/class_scope_weird_runme.go b/Examples/test-suite/go/class_scope_weird_runme.go +index a42bdad21..477699061 100644 +--- a/Examples/test-suite/go/class_scope_weird_runme.go ++++ b/Examples/test-suite/go/class_scope_weird_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "class_scope_weird" ++import "swigtests/class_scope_weird" + + func main() { + f := class_scope_weird.NewFoo() +diff --git a/Examples/test-suite/go/compactdefaultargs_runme.go b/Examples/test-suite/go/compactdefaultargs_runme.go +index fe6224ca2..c9e90087f 100644 +--- a/Examples/test-suite/go/compactdefaultargs_runme.go ++++ b/Examples/test-suite/go/compactdefaultargs_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "compactdefaultargs" ++import . "swigtests/compactdefaultargs" + + func main() { + defaults1 := NewDefaults1(1000) +diff --git a/Examples/test-suite/go/constover_runme.go b/Examples/test-suite/go/constover_runme.go +index 6c837095a..51d965e7f 100644 +--- a/Examples/test-suite/go/constover_runme.go ++++ b/Examples/test-suite/go/constover_runme.go +@@ -4,7 +4,7 @@ import ( + "fmt" + "os" + +- "constover" ++ "swigtests/constover" + ) + + func main() { +diff --git a/Examples/test-suite/go/constructor_copy_runme.go b/Examples/test-suite/go/constructor_copy_runme.go +index 68c428853..ca4725549 100644 +--- a/Examples/test-suite/go/constructor_copy_runme.go ++++ b/Examples/test-suite/go/constructor_copy_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "constructor_copy" ++import . "swigtests/constructor_copy" + + func main() { + f1 := NewFoo1(3) +diff --git a/Examples/test-suite/go/contract_runme.go b/Examples/test-suite/go/contract_runme.go +index b028855c3..7c9d0979e 100644 +--- a/Examples/test-suite/go/contract_runme.go ++++ b/Examples/test-suite/go/contract_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "contract" ++import "swigtests/contract" + + func main() { + contract.Test_preassert(1, 2) +diff --git a/Examples/test-suite/go/cpp11_strongly_typed_enumerations_runme.go b/Examples/test-suite/go/cpp11_strongly_typed_enumerations_runme.go +index f9ca74a1e..926b6f756 100644 +--- a/Examples/test-suite/go/cpp11_strongly_typed_enumerations_runme.go ++++ b/Examples/test-suite/go/cpp11_strongly_typed_enumerations_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import . "cpp11_strongly_typed_enumerations" ++import . "swigtests/cpp11_strongly_typed_enumerations" + + func enumCheck(actual int, expected int) int { + if actual != expected { +diff --git a/Examples/test-suite/go/cpp_enum_runme.go b/Examples/test-suite/go/cpp_enum_runme.go +index 8906dd4f1..9b8930a44 100644 +--- a/Examples/test-suite/go/cpp_enum_runme.go ++++ b/Examples/test-suite/go/cpp_enum_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "cpp_enum" ++import "swigtests/cpp_enum" + + func main() { + f := cpp_enum.NewFoo() +diff --git a/Examples/test-suite/go/cpp_namespace_runme.go b/Examples/test-suite/go/cpp_namespace_runme.go +index aecdd9543..71affc57d 100644 +--- a/Examples/test-suite/go/cpp_namespace_runme.go ++++ b/Examples/test-suite/go/cpp_namespace_runme.go +@@ -1,7 +1,7 @@ + // Note: This example assumes that namespaces are flattened + package main + +-import "cpp_namespace" ++import "swigtests/cpp_namespace" + + func main() { + n := cpp_namespace.Fact(4) +diff --git a/Examples/test-suite/go/cpp_static_runme.go b/Examples/test-suite/go/cpp_static_runme.go +index 1ad981a60..d482298eb 100644 +--- a/Examples/test-suite/go/cpp_static_runme.go ++++ b/Examples/test-suite/go/cpp_static_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "cpp_static" ++import . "swigtests/cpp_static" + + func main() { + StaticFunctionTestStatic_func() +diff --git a/Examples/test-suite/go/default_args_runme.go b/Examples/test-suite/go/default_args_runme.go +index a39f95716..5b6f404e3 100644 +--- a/Examples/test-suite/go/default_args_runme.go ++++ b/Examples/test-suite/go/default_args_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "default_args" ++import "swigtests/default_args" + + func main() { + if default_args.StaticsStaticmethod() != 60 { +diff --git a/Examples/test-suite/go/default_constructor_runme.go b/Examples/test-suite/go/default_constructor_runme.go +index eeac7eaf8..90d960143 100644 +--- a/Examples/test-suite/go/default_constructor_runme.go ++++ b/Examples/test-suite/go/default_constructor_runme.go +@@ -1,6 +1,6 @@ + package main + +-import dc "default_constructor" ++import dc "swigtests/default_constructor" + + func main() { + a := dc.NewA() +diff --git a/Examples/test-suite/go/director_alternating_runme.go b/Examples/test-suite/go/director_alternating_runme.go +index b4793aa8f..2df31db82 100644 +--- a/Examples/test-suite/go/director_alternating_runme.go ++++ b/Examples/test-suite/go/director_alternating_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_alternating" ++import . "swigtests/director_alternating" + + func main() { + id := GetBar().Id() +diff --git a/Examples/test-suite/go/director_basic_runme.go b/Examples/test-suite/go/director_basic_runme.go +index 360424d9b..c308f2520 100644 +--- a/Examples/test-suite/go/director_basic_runme.go ++++ b/Examples/test-suite/go/director_basic_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "director_basic" ++import "swigtests/director_basic" + + type GoFoo struct{} + +diff --git a/Examples/test-suite/go/director_classic_runme.go b/Examples/test-suite/go/director_classic_runme.go +index 230c9638d..d8acc1337 100644 +--- a/Examples/test-suite/go/director_classic_runme.go ++++ b/Examples/test-suite/go/director_classic_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import . "director_classic" ++import . "swigtests/director_classic" + + type TargetLangPerson struct{} // From Person + func (p *TargetLangPerson) Id() string { +diff --git a/Examples/test-suite/go/director_default_runme.go b/Examples/test-suite/go/director_default_runme.go +index ac2aace1d..557d5c54b 100644 +--- a/Examples/test-suite/go/director_default_runme.go ++++ b/Examples/test-suite/go/director_default_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_default" ++import . "swigtests/director_default" + + func main() { + NewFoo() +diff --git a/Examples/test-suite/go/director_detect_runme.go b/Examples/test-suite/go/director_detect_runme.go +index 0c3c95fdc..f82a0c04a 100644 +--- a/Examples/test-suite/go/director_detect_runme.go ++++ b/Examples/test-suite/go/director_detect_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "director_detect" ++import "swigtests/director_detect" + + type MyBar struct { + val int +diff --git a/Examples/test-suite/go/director_enum_runme.go b/Examples/test-suite/go/director_enum_runme.go +index 002d425d2..3e67417b2 100644 +--- a/Examples/test-suite/go/director_enum_runme.go ++++ b/Examples/test-suite/go/director_enum_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "director_enum" ++import "swigtests/director_enum" + + type MyFoo struct{} // From director_enum.Foo + func (p *MyFoo) Say_hi(val director_enum.EnumDirectorHello) director_enum.EnumDirectorHello { +diff --git a/Examples/test-suite/go/director_exception_runme.go b/Examples/test-suite/go/director_exception_runme.go +index 55231ff16..167d75193 100644 +--- a/Examples/test-suite/go/director_exception_runme.go ++++ b/Examples/test-suite/go/director_exception_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_exception" ++import . "swigtests/director_exception" + + type Exception struct { + msg string +diff --git a/Examples/test-suite/go/director_extend_runme.go b/Examples/test-suite/go/director_extend_runme.go +index 27e55b997..adfb6ddb7 100644 +--- a/Examples/test-suite/go/director_extend_runme.go ++++ b/Examples/test-suite/go/director_extend_runme.go +@@ -5,7 +5,7 @@ + + package main + +-import . "director_extend" ++import . "swigtests/director_extend" + + func main() { + m := NewSpObject() +diff --git a/Examples/test-suite/go/director_finalizer_runme.go b/Examples/test-suite/go/director_finalizer_runme.go +index d36a4ba33..5cd9d95e0 100644 +--- a/Examples/test-suite/go/director_finalizer_runme.go ++++ b/Examples/test-suite/go/director_finalizer_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_finalizer" ++import . "swigtests/director_finalizer" + + type MyFoo struct{} // From Foo + func DeleteMyFoo(p Foo) { +diff --git a/Examples/test-suite/go/director_frob_runme.go b/Examples/test-suite/go/director_frob_runme.go +index 3985eb14b..7354fa76b 100644 +--- a/Examples/test-suite/go/director_frob_runme.go ++++ b/Examples/test-suite/go/director_frob_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_frob" ++import . "swigtests/director_frob" + + func main() { + foo := NewBravo() +diff --git a/Examples/test-suite/go/director_nested_runme.go b/Examples/test-suite/go/director_nested_runme.go +index a1193ad59..b04893582 100644 +--- a/Examples/test-suite/go/director_nested_runme.go ++++ b/Examples/test-suite/go/director_nested_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_nested" ++import . "swigtests/director_nested" + + type A struct{} // From FooBar_int + func (p *A) Do_step() string { +diff --git a/Examples/test-suite/go/director_profile_runme.go b/Examples/test-suite/go/director_profile_runme.go +index a9bc7934b..da0ea219b 100644 +--- a/Examples/test-suite/go/director_profile_runme.go ++++ b/Examples/test-suite/go/director_profile_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import "director_profile" ++import "swigtests/director_profile" + + type MyB struct{} // From director_profile.B + func (p *MyB) Vfi(a int) int { +diff --git a/Examples/test-suite/go/director_protected_runme.go b/Examples/test-suite/go/director_protected_runme.go +index bfd50c6b2..0012ccdb2 100644 +--- a/Examples/test-suite/go/director_protected_runme.go ++++ b/Examples/test-suite/go/director_protected_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_protected" ++import . "swigtests/director_protected" + + type FooBar struct{} // From Bar + func (p *FooBar) Ping() string { +diff --git a/Examples/test-suite/go/director_string_runme.go b/Examples/test-suite/go/director_string_runme.go +index f4f9cc150..0c73b6a29 100644 +--- a/Examples/test-suite/go/director_string_runme.go ++++ b/Examples/test-suite/go/director_string_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "director_string" ++import . "swigtests/director_string" + + type B struct { // From A + abi A +diff --git a/Examples/test-suite/go/director_unroll_runme.go b/Examples/test-suite/go/director_unroll_runme.go +index 6a919f656..560034c8a 100644 +--- a/Examples/test-suite/go/director_unroll_runme.go ++++ b/Examples/test-suite/go/director_unroll_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "director_unroll" ++import "swigtests/director_unroll" + + type MyFoo struct{} // From director_unroll.Foo + func (p *MyFoo) Ping() string { +diff --git a/Examples/test-suite/go/disown_runme.go b/Examples/test-suite/go/disown_runme.go +index 4484515fd..ba072a888 100644 +--- a/Examples/test-suite/go/disown_runme.go ++++ b/Examples/test-suite/go/disown_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "disown" ++import . "swigtests/disown" + + func main() { + a := NewA() +diff --git a/Examples/test-suite/go/dynamic_cast_runme.go b/Examples/test-suite/go/dynamic_cast_runme.go +index 46ba23698..213bc0ce5 100644 +--- a/Examples/test-suite/go/dynamic_cast_runme.go ++++ b/Examples/test-suite/go/dynamic_cast_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "dynamic_cast" ++import "swigtests/dynamic_cast" + + func main() { + f := dynamic_cast.NewFoo() +diff --git a/Examples/test-suite/go/empty_c_runme.go b/Examples/test-suite/go/empty_c_runme.go +index 1a1bd9cc5..f093103f6 100644 +--- a/Examples/test-suite/go/empty_c_runme.go ++++ b/Examples/test-suite/go/empty_c_runme.go +@@ -1,6 +1,6 @@ + package main + +-import _ "empty_c" ++import _ "swigtests/empty_c" + + func main() { + } +diff --git a/Examples/test-suite/go/empty_runme.go b/Examples/test-suite/go/empty_runme.go +index 681a6f3ad..03f423b8b 100644 +--- a/Examples/test-suite/go/empty_runme.go ++++ b/Examples/test-suite/go/empty_runme.go +@@ -1,6 +1,6 @@ + package main + +-import _ "empty" ++import _ "swigtests/empty" + + func main() { + } +diff --git a/Examples/test-suite/go/enum_template_runme.go b/Examples/test-suite/go/enum_template_runme.go +index c60a452d7..7f43eab68 100644 +--- a/Examples/test-suite/go/enum_template_runme.go ++++ b/Examples/test-suite/go/enum_template_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "enum_template" ++import "swigtests/enum_template" + + func main() { + if enum_template.MakeETest() != 1 { +diff --git a/Examples/test-suite/go/enums_runme.go b/Examples/test-suite/go/enums_runme.go +index 7a528b3e2..4a879a048 100644 +--- a/Examples/test-suite/go/enums_runme.go ++++ b/Examples/test-suite/go/enums_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "enums" ++import "swigtests/enums" + + func main() { + enums.Bar2(1) +diff --git a/Examples/test-suite/go/exception_order_runme.go b/Examples/test-suite/go/exception_order_runme.go +index 21dcff312..ee67712fc 100644 +--- a/Examples/test-suite/go/exception_order_runme.go ++++ b/Examples/test-suite/go/exception_order_runme.go +@@ -1,7 +1,7 @@ + package main + + import "strings" +-import . "exception_order" ++import . "swigtests/exception_order" + + func main() { + a := NewA() +diff --git a/Examples/test-suite/go/extend_placement_runme.go b/Examples/test-suite/go/extend_placement_runme.go +index 253ec6618..879589679 100644 +--- a/Examples/test-suite/go/extend_placement_runme.go ++++ b/Examples/test-suite/go/extend_placement_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "extend_placement" ++import "swigtests/extend_placement" + + func main() { + foo := extend_placement.NewFoo() +diff --git a/Examples/test-suite/go/extend_template_ns_runme.go b/Examples/test-suite/go/extend_template_ns_runme.go +index d005172a4..b1dd43a78 100644 +--- a/Examples/test-suite/go/extend_template_ns_runme.go ++++ b/Examples/test-suite/go/extend_template_ns_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "extend_template_ns" ++import . "swigtests/extend_template_ns" + + func main() { + f := NewFoo_One() +diff --git a/Examples/test-suite/go/extend_template_runme.go b/Examples/test-suite/go/extend_template_runme.go +index a5c4da4e1..4a6b7099b 100644 +--- a/Examples/test-suite/go/extend_template_runme.go ++++ b/Examples/test-suite/go/extend_template_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "extend_template" ++import "swigtests/extend_template" + + func main() { + f := extend_template.NewFoo_0() +diff --git a/Examples/test-suite/go/extend_variable_runme.go b/Examples/test-suite/go/extend_variable_runme.go +index 9425aee4d..278bffed6 100644 +--- a/Examples/test-suite/go/extend_variable_runme.go ++++ b/Examples/test-suite/go/extend_variable_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "extend_variable" ++import . "swigtests/extend_variable" + + func main() { + if FooBar != 42 { +diff --git a/Examples/test-suite/go/extern_c_runme.go b/Examples/test-suite/go/extern_c_runme.go +index 9bc2cd0cc..1cbfd9d80 100644 +--- a/Examples/test-suite/go/extern_c_runme.go ++++ b/Examples/test-suite/go/extern_c_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "extern_c" ++import "swigtests/extern_c" + + func main() { + extern_c.RealFunction(2) +diff --git a/Examples/test-suite/go/friends_runme.go b/Examples/test-suite/go/friends_runme.go +index 2e34a4db0..b6b9e93f3 100644 +--- a/Examples/test-suite/go/friends_runme.go ++++ b/Examples/test-suite/go/friends_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "friends" ++import "swigtests/friends" + + func main() { + a := friends.NewA(2) +diff --git a/Examples/test-suite/go/fvirtual_runme.go b/Examples/test-suite/go/fvirtual_runme.go +index 86ef90f18..01b94f419 100644 +--- a/Examples/test-suite/go/fvirtual_runme.go ++++ b/Examples/test-suite/go/fvirtual_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "fvirtual" ++import . "swigtests/fvirtual" + + func main() { + sw := NewNodeSwitch() +diff --git a/Examples/test-suite/go/global_ns_arg_runme.go b/Examples/test-suite/go/global_ns_arg_runme.go +index e86aa6747..aeacd91a3 100644 +--- a/Examples/test-suite/go/global_ns_arg_runme.go ++++ b/Examples/test-suite/go/global_ns_arg_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "global_ns_arg" ++import . "swigtests/global_ns_arg" + + func main() { + Foo(1) +diff --git a/Examples/test-suite/go/go_director_inout_runme.go b/Examples/test-suite/go/go_director_inout_runme.go +index e6768a465..171b3c223 100644 +--- a/Examples/test-suite/go/go_director_inout_runme.go ++++ b/Examples/test-suite/go/go_director_inout_runme.go +@@ -1,7 +1,7 @@ + package main + + import ( +- wrap "go_director_inout" ++ wrap "swigtests/go_director_inout" + ) + + type GoMyClass struct {} +diff --git a/Examples/test-suite/go/go_inout_runme.go b/Examples/test-suite/go/go_inout_runme.go +index 4599aa104..2dc5b9908 100644 +--- a/Examples/test-suite/go/go_inout_runme.go ++++ b/Examples/test-suite/go/go_inout_runme.go +@@ -5,7 +5,7 @@ import ( + "fmt" + "reflect" + +- "go_inout" ++ "swigtests/go_inout" + ) + + type S struct { +diff --git a/Examples/test-suite/go/grouping_runme.go b/Examples/test-suite/go/grouping_runme.go +index f808e1286..d5f347579 100644 +--- a/Examples/test-suite/go/grouping_runme.go ++++ b/Examples/test-suite/go/grouping_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "grouping" ++import "swigtests/grouping" + + func main() { + x := grouping.Test1(42) +diff --git a/Examples/test-suite/go/import_nomodule_runme.go b/Examples/test-suite/go/import_nomodule_runme.go +index 48592df25..23680159d 100644 +--- a/Examples/test-suite/go/import_nomodule_runme.go ++++ b/Examples/test-suite/go/import_nomodule_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "import_nomodule" ++import . "swigtests/import_nomodule" + + func main() { + f := Create_Foo() +diff --git a/Examples/test-suite/go/inctest_runme.go b/Examples/test-suite/go/inctest_runme.go +index 3148abcd2..490721e75 100644 +--- a/Examples/test-suite/go/inctest_runme.go ++++ b/Examples/test-suite/go/inctest_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "inctest" ++import "swigtests/inctest" + + func main() { + inctest.NewA() +diff --git a/Examples/test-suite/go/inherit_member_runme.go b/Examples/test-suite/go/inherit_member_runme.go +index 6fd70cf80..10dabad96 100644 +--- a/Examples/test-suite/go/inherit_member_runme.go ++++ b/Examples/test-suite/go/inherit_member_runme.go +@@ -1,6 +1,6 @@ + package main + +-import wrap "inherit_member" ++import wrap "swigtests/inherit_member" + + func main() { + s := wrap.NewChild() +diff --git a/Examples/test-suite/go/inherit_missing_runme.go b/Examples/test-suite/go/inherit_missing_runme.go +index c70c48306..b4706e974 100644 +--- a/Examples/test-suite/go/inherit_missing_runme.go ++++ b/Examples/test-suite/go/inherit_missing_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "inherit_missing" ++import "swigtests/inherit_missing" + + func main() { + a := inherit_missing.New_Foo() +diff --git a/Examples/test-suite/go/input_runme.go b/Examples/test-suite/go/input_runme.go +index ddc2992fe..c5eb9e45d 100644 +--- a/Examples/test-suite/go/input_runme.go ++++ b/Examples/test-suite/go/input_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "input" ++import . "swigtests/input" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/keyword_rename_c_runme.go b/Examples/test-suite/go/keyword_rename_c_runme.go +index 26f2ea42b..28f6ddd12 100644 +--- a/Examples/test-suite/go/keyword_rename_c_runme.go ++++ b/Examples/test-suite/go/keyword_rename_c_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "keyword_rename_c" ++import "swigtests/keyword_rename_c" + + func main() { + keyword_rename_c.Xgo(1) +diff --git a/Examples/test-suite/go/keyword_rename_runme.go b/Examples/test-suite/go/keyword_rename_runme.go +index 7a40ff83d..f93c7ab14 100644 +--- a/Examples/test-suite/go/keyword_rename_runme.go ++++ b/Examples/test-suite/go/keyword_rename_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "keyword_rename" ++import "swigtests/keyword_rename" + + func main() { + keyword_rename.Xgo(1) +diff --git a/Examples/test-suite/go/li_attribute_runme.go b/Examples/test-suite/go/li_attribute_runme.go +index b502b8cea..0702b898f 100644 +--- a/Examples/test-suite/go/li_attribute_runme.go ++++ b/Examples/test-suite/go/li_attribute_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "li_attribute" ++import "swigtests/li_attribute" + + func main() { + aa := li_attribute.NewA(1, 2, 3) +diff --git a/Examples/test-suite/go/li_carrays_cpp_runme.go b/Examples/test-suite/go/li_carrays_cpp_runme.go +index cfc171284..a96291c7b 100644 +--- a/Examples/test-suite/go/li_carrays_cpp_runme.go ++++ b/Examples/test-suite/go/li_carrays_cpp_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_carrays_cpp" ++import . "swigtests/li_carrays_cpp" + + func main() { + d := NewDoubleArray(10) +diff --git a/Examples/test-suite/go/li_carrays_runme.go b/Examples/test-suite/go/li_carrays_runme.go +index 9128bbfd1..eefc6ad72 100644 +--- a/Examples/test-suite/go/li_carrays_runme.go ++++ b/Examples/test-suite/go/li_carrays_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_carrays" ++import . "swigtests/li_carrays" + + func main() { + d := NewDoubleArray(10) +diff --git a/Examples/test-suite/go/li_cdata_cpp_runme.go b/Examples/test-suite/go/li_cdata_cpp_runme.go +index daa5384f7..5849c50d4 100644 +--- a/Examples/test-suite/go/li_cdata_cpp_runme.go ++++ b/Examples/test-suite/go/li_cdata_cpp_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_cdata_cpp" ++import . "swigtests/li_cdata_cpp" + + func main() { + s := "ABC abc" +diff --git a/Examples/test-suite/go/li_cdata_runme.go b/Examples/test-suite/go/li_cdata_runme.go +index 9458dab43..0c3e591ce 100644 +--- a/Examples/test-suite/go/li_cdata_runme.go ++++ b/Examples/test-suite/go/li_cdata_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_cdata" ++import . "swigtests/li_cdata" + + func main() { + s := "ABC abc" +diff --git a/Examples/test-suite/go/li_cmalloc_runme.go b/Examples/test-suite/go/li_cmalloc_runme.go +index 5b9f9704a..fb1b009c3 100644 +--- a/Examples/test-suite/go/li_cmalloc_runme.go ++++ b/Examples/test-suite/go/li_cmalloc_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_cmalloc" ++import . "swigtests/li_cmalloc" + + func main() { + p := Malloc_int() +diff --git a/Examples/test-suite/go/li_cpointer_cpp_runme.go b/Examples/test-suite/go/li_cpointer_cpp_runme.go +index 0de57c624..f422b2310 100644 +--- a/Examples/test-suite/go/li_cpointer_cpp_runme.go ++++ b/Examples/test-suite/go/li_cpointer_cpp_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_cpointer_cpp" ++import . "swigtests/li_cpointer_cpp" + + func main() { + p := New_intp() +diff --git a/Examples/test-suite/go/li_cpointer_runme.go b/Examples/test-suite/go/li_cpointer_runme.go +index 0fe29e77d..1a83bc62f 100644 +--- a/Examples/test-suite/go/li_cpointer_runme.go ++++ b/Examples/test-suite/go/li_cpointer_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_cpointer" ++import . "swigtests/li_cpointer" + + func main() { + p := New_intp() +diff --git a/Examples/test-suite/go/li_std_map_runme.go b/Examples/test-suite/go/li_std_map_runme.go +index 5c5cc2e4c..019ac6e30 100644 +--- a/Examples/test-suite/go/li_std_map_runme.go ++++ b/Examples/test-suite/go/li_std_map_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "li_std_map" ++import "swigtests/li_std_map" + + func main() { + a1 := li_std_map.NewA(3) +diff --git a/Examples/test-suite/go/li_std_vector_ptr_runme.go b/Examples/test-suite/go/li_std_vector_ptr_runme.go +index d66ff19c6..9a62d3796 100644 +--- a/Examples/test-suite/go/li_std_vector_ptr_runme.go ++++ b/Examples/test-suite/go/li_std_vector_ptr_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "li_std_vector_ptr" ++import . "swigtests/li_std_vector_ptr" + import "fmt" + + func check(val1 int, val2 int) { +diff --git a/Examples/test-suite/go/member_pointer_runme.go b/Examples/test-suite/go/member_pointer_runme.go +index 731526b75..02789382e 100644 +--- a/Examples/test-suite/go/member_pointer_runme.go ++++ b/Examples/test-suite/go/member_pointer_runme.go +@@ -3,7 +3,7 @@ + package main + + import "fmt" +-import . "member_pointer" ++import . "swigtests/member_pointer" + + func check(what string, expected float64, actual float64) { + if expected != actual { +diff --git a/Examples/test-suite/go/memberin_extend_c_runme.go b/Examples/test-suite/go/memberin_extend_c_runme.go +index 0551acc90..696f08abb 100644 +--- a/Examples/test-suite/go/memberin_extend_c_runme.go ++++ b/Examples/test-suite/go/memberin_extend_c_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "memberin_extend_c" ++import "swigtests/memberin_extend_c" + + func main() { + t := memberin_extend_c.NewPerson() +diff --git a/Examples/test-suite/go/minherit_runme.go b/Examples/test-suite/go/minherit_runme.go +index 9b7873cb0..f1504af31 100644 +--- a/Examples/test-suite/go/minherit_runme.go ++++ b/Examples/test-suite/go/minherit_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import "minherit" ++import "swigtests/minherit" + + func main() { + a := minherit.NewFoo() +diff --git a/Examples/test-suite/go/namespace_class_runme.go b/Examples/test-suite/go/namespace_class_runme.go +index 4c240b6a4..435ee868a 100644 +--- a/Examples/test-suite/go/namespace_class_runme.go ++++ b/Examples/test-suite/go/namespace_class_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "namespace_class" ++import . "swigtests/namespace_class" + + func main() { + EulerT3DToFrame(1, 1, 1) +diff --git a/Examples/test-suite/go/namespace_typemap_runme.go b/Examples/test-suite/go/namespace_typemap_runme.go +index 47e2b64f1..6da43331b 100644 +--- a/Examples/test-suite/go/namespace_typemap_runme.go ++++ b/Examples/test-suite/go/namespace_typemap_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "namespace_typemap" ++import . "swigtests/namespace_typemap" + + func main() { + if Stest1("hello") != "hello" { +diff --git a/Examples/test-suite/go/namespace_virtual_method_runme.go b/Examples/test-suite/go/namespace_virtual_method_runme.go +index a8cb38bad..7ac4d3304 100644 +--- a/Examples/test-suite/go/namespace_virtual_method_runme.go ++++ b/Examples/test-suite/go/namespace_virtual_method_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "namespace_virtual_method" ++import "swigtests/namespace_virtual_method" + + func main() { + _ = namespace_virtual_method.NewSpam() +diff --git a/Examples/test-suite/go/naturalvar_runme.go b/Examples/test-suite/go/naturalvar_runme.go +index ed47e9d2d..458745ec4 100644 +--- a/Examples/test-suite/go/naturalvar_runme.go ++++ b/Examples/test-suite/go/naturalvar_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "naturalvar" ++import . "swigtests/naturalvar" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/nested_workaround_runme.go b/Examples/test-suite/go/nested_workaround_runme.go +index 8b31a7f4b..f42b48764 100644 +--- a/Examples/test-suite/go/nested_workaround_runme.go ++++ b/Examples/test-suite/go/nested_workaround_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "nested_workaround" ++import . "swigtests/nested_workaround" + + func main() { + inner := NewInner(5) +diff --git a/Examples/test-suite/go/overload_complicated_runme.go b/Examples/test-suite/go/overload_complicated_runme.go +index ce9d124c8..c238d974f 100644 +--- a/Examples/test-suite/go/overload_complicated_runme.go ++++ b/Examples/test-suite/go/overload_complicated_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "overload_complicated" ++import . "swigtests/overload_complicated" + + func main() { + var pInt *int +diff --git a/Examples/test-suite/go/overload_copy_runme.go b/Examples/test-suite/go/overload_copy_runme.go +index 55ec4a333..9815d76ef 100644 +--- a/Examples/test-suite/go/overload_copy_runme.go ++++ b/Examples/test-suite/go/overload_copy_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "overload_copy" ++import . "swigtests/overload_copy" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/overload_extend2_runme.go b/Examples/test-suite/go/overload_extend2_runme.go +index db790989c..d549098ba 100644 +--- a/Examples/test-suite/go/overload_extend2_runme.go ++++ b/Examples/test-suite/go/overload_extend2_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "overload_extend2" ++import "swigtests/overload_extend2" + + func main() { + f := overload_extend2.NewFoo() +diff --git a/Examples/test-suite/go/overload_extend_c_runme.go b/Examples/test-suite/go/overload_extend_c_runme.go +index 4d3b2b6e1..93b91d9e1 100644 +--- a/Examples/test-suite/go/overload_extend_c_runme.go ++++ b/Examples/test-suite/go/overload_extend_c_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "overload_extend_c" ++import "swigtests/overload_extend_c" + + func main() { + f := overload_extend_c.NewFoo() +diff --git a/Examples/test-suite/go/overload_extend_runme.go b/Examples/test-suite/go/overload_extend_runme.go +index d73d6cf3c..c1435f376 100644 +--- a/Examples/test-suite/go/overload_extend_runme.go ++++ b/Examples/test-suite/go/overload_extend_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "overload_extend" ++import "swigtests/overload_extend" + + func main() { + f := overload_extend.NewFoo() +diff --git a/Examples/test-suite/go/overload_polymorphic_runme.go b/Examples/test-suite/go/overload_polymorphic_runme.go +index 12b9777e6..6a4301f46 100644 +--- a/Examples/test-suite/go/overload_polymorphic_runme.go ++++ b/Examples/test-suite/go/overload_polymorphic_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "overload_polymorphic" ++import "swigtests/overload_polymorphic" + + func main(){ + t := overload_polymorphic.NewDerived() +diff --git a/Examples/test-suite/go/overload_rename_runme.go b/Examples/test-suite/go/overload_rename_runme.go +index 3bd4a69c5..982b1786a 100644 +--- a/Examples/test-suite/go/overload_rename_runme.go ++++ b/Examples/test-suite/go/overload_rename_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "overload_rename" ++import "swigtests/overload_rename" + + func main() { + _ = overload_rename.NewFoo(float32(1)) +diff --git a/Examples/test-suite/go/overload_simple_runme.go b/Examples/test-suite/go/overload_simple_runme.go +index 3eb859bac..23a80bf69 100644 +--- a/Examples/test-suite/go/overload_simple_runme.go ++++ b/Examples/test-suite/go/overload_simple_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "overload_simple" ++import . "swigtests/overload_simple" + + func main() { + if Foo(3) != "foo:int" { +diff --git a/Examples/test-suite/go/overload_subtype_runme.go b/Examples/test-suite/go/overload_subtype_runme.go +index 45d5a025f..09f7a83f4 100644 +--- a/Examples/test-suite/go/overload_subtype_runme.go ++++ b/Examples/test-suite/go/overload_subtype_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "overload_subtype" ++import . "swigtests/overload_subtype" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/overload_template_fast_runme.go b/Examples/test-suite/go/overload_template_fast_runme.go +index 63809c0ff..3b348f366 100644 +--- a/Examples/test-suite/go/overload_template_fast_runme.go ++++ b/Examples/test-suite/go/overload_template_fast_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "overload_template_fast" ++import . "swigtests/overload_template_fast" + + func main() { + _ = Foo() +diff --git a/Examples/test-suite/go/overload_template_runme.go b/Examples/test-suite/go/overload_template_runme.go +index f3a08ecd6..b85afb4d1 100644 +--- a/Examples/test-suite/go/overload_template_runme.go ++++ b/Examples/test-suite/go/overload_template_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "overload_template" ++import . "swigtests/overload_template" + + func main() { + _ = Foo() +diff --git a/Examples/test-suite/go/preproc_runme.go b/Examples/test-suite/go/preproc_runme.go +index 3c55aae72..878305463 100644 +--- a/Examples/test-suite/go/preproc_runme.go ++++ b/Examples/test-suite/go/preproc_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "preproc" ++import "swigtests/preproc" + + func main() { + if preproc.GetEndif() != 1 { +diff --git a/Examples/test-suite/go/primitive_ref_runme.go b/Examples/test-suite/go/primitive_ref_runme.go +index a1de2f8a5..8dcf9f5a9 100644 +--- a/Examples/test-suite/go/primitive_ref_runme.go ++++ b/Examples/test-suite/go/primitive_ref_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "primitive_ref" ++import . "swigtests/primitive_ref" + + func main() { + if Ref_int(3) != 3 { +diff --git a/Examples/test-suite/go/profiletest_runme.go b/Examples/test-suite/go/profiletest_runme.go +index c2b922ba3..68509f550 100644 +--- a/Examples/test-suite/go/profiletest_runme.go ++++ b/Examples/test-suite/go/profiletest_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import "profiletest" ++import "swigtests/profiletest" + + func main() { + a := profiletest.NewA() +diff --git a/Examples/test-suite/go/refcount_runme.go b/Examples/test-suite/go/refcount_runme.go +index 07d407273..76e30dda3 100644 +--- a/Examples/test-suite/go/refcount_runme.go ++++ b/Examples/test-suite/go/refcount_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "refcount" ++import . "swigtests/refcount" + + // very innocent example + +diff --git a/Examples/test-suite/go/reference_global_vars_runme.go b/Examples/test-suite/go/reference_global_vars_runme.go +index 908358f95..f8c125854 100644 +--- a/Examples/test-suite/go/reference_global_vars_runme.go ++++ b/Examples/test-suite/go/reference_global_vars_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "reference_global_vars" ++import . "swigtests/reference_global_vars" + + func main() { + // const class reference variable +diff --git a/Examples/test-suite/go/rename_scope_runme.go b/Examples/test-suite/go/rename_scope_runme.go +index 13bd3f178..4ad7549ad 100644 +--- a/Examples/test-suite/go/rename_scope_runme.go ++++ b/Examples/test-suite/go/rename_scope_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "rename_scope" ++import . "swigtests/rename_scope" + + func main() { + a := NewNatural_UP() +diff --git a/Examples/test-suite/go/rename_simple_runme.go b/Examples/test-suite/go/rename_simple_runme.go +index bd559ef27..efe1edc7b 100644 +--- a/Examples/test-suite/go/rename_simple_runme.go ++++ b/Examples/test-suite/go/rename_simple_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import . "rename_simple" ++import . "swigtests/rename_simple" + + func main() { + s := NewNewStruct() +diff --git a/Examples/test-suite/go/rename_strip_encoder_runme.go b/Examples/test-suite/go/rename_strip_encoder_runme.go +index ae670600c..74a0dbaaf 100644 +--- a/Examples/test-suite/go/rename_strip_encoder_runme.go ++++ b/Examples/test-suite/go/rename_strip_encoder_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "rename_strip_encoder" ++import . "swigtests/rename_strip_encoder" + + func main() { + _ = NewSomeWidget() +diff --git a/Examples/test-suite/go/ret_by_value_runme.go b/Examples/test-suite/go/ret_by_value_runme.go +index 9659d21e9..345868dcd 100644 +--- a/Examples/test-suite/go/ret_by_value_runme.go ++++ b/Examples/test-suite/go/ret_by_value_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "ret_by_value" ++import "swigtests/ret_by_value" + + func main() { + a := ret_by_value.Get_test() +diff --git a/Examples/test-suite/go/return_const_value_runme.go b/Examples/test-suite/go/return_const_value_runme.go +index aadb1265e..fc6baa240 100644 +--- a/Examples/test-suite/go/return_const_value_runme.go ++++ b/Examples/test-suite/go/return_const_value_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "return_const_value" ++import "swigtests/return_const_value" + + func main() { + p := return_const_value.Foo_ptrGetPtr() +diff --git a/Examples/test-suite/go/smart_pointer_extend_runme.go b/Examples/test-suite/go/smart_pointer_extend_runme.go +index a851e26b7..f91c9ac99 100644 +--- a/Examples/test-suite/go/smart_pointer_extend_runme.go ++++ b/Examples/test-suite/go/smart_pointer_extend_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_extend" ++import . "swigtests/smart_pointer_extend" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_member_runme.go b/Examples/test-suite/go/smart_pointer_member_runme.go +index e7fe7c4c2..ca2ac2c76 100644 +--- a/Examples/test-suite/go/smart_pointer_member_runme.go ++++ b/Examples/test-suite/go/smart_pointer_member_runme.go +@@ -1,7 +1,7 @@ + package main + + import "fmt" +-import . "smart_pointer_member" ++import . "swigtests/smart_pointer_member" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_multi_runme.go b/Examples/test-suite/go/smart_pointer_multi_runme.go +index 7c76061af..a8ec39f54 100644 +--- a/Examples/test-suite/go/smart_pointer_multi_runme.go ++++ b/Examples/test-suite/go/smart_pointer_multi_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_multi" ++import . "swigtests/smart_pointer_multi" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_multi_typedef_runme.go b/Examples/test-suite/go/smart_pointer_multi_typedef_runme.go +index e584cf7a2..6bfd21ef6 100644 +--- a/Examples/test-suite/go/smart_pointer_multi_typedef_runme.go ++++ b/Examples/test-suite/go/smart_pointer_multi_typedef_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_multi_typedef" ++import . "swigtests/smart_pointer_multi_typedef" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_overload_runme.go b/Examples/test-suite/go/smart_pointer_overload_runme.go +index 9481554f0..c28ce6100 100644 +--- a/Examples/test-suite/go/smart_pointer_overload_runme.go ++++ b/Examples/test-suite/go/smart_pointer_overload_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_overload" ++import . "swigtests/smart_pointer_overload" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_rename_runme.go b/Examples/test-suite/go/smart_pointer_rename_runme.go +index 44841f5e6..22c0eb1e9 100644 +--- a/Examples/test-suite/go/smart_pointer_rename_runme.go ++++ b/Examples/test-suite/go/smart_pointer_rename_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_rename" ++import . "swigtests/smart_pointer_rename" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_simple_runme.go b/Examples/test-suite/go/smart_pointer_simple_runme.go +index b468bd2e5..8a14dcf9b 100644 +--- a/Examples/test-suite/go/smart_pointer_simple_runme.go ++++ b/Examples/test-suite/go/smart_pointer_simple_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_simple" ++import . "swigtests/smart_pointer_simple" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/smart_pointer_templatevariables_runme.go b/Examples/test-suite/go/smart_pointer_templatevariables_runme.go +index 6d4ea91de..8f7102d43 100644 +--- a/Examples/test-suite/go/smart_pointer_templatevariables_runme.go ++++ b/Examples/test-suite/go/smart_pointer_templatevariables_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_templatevariables" ++import . "swigtests/smart_pointer_templatevariables" + + func main() { + d := NewDiffImContainerPtr_D(Create(1234, 5678)) +diff --git a/Examples/test-suite/go/smart_pointer_typedef_runme.go b/Examples/test-suite/go/smart_pointer_typedef_runme.go +index e89a8b150..5468a2926 100644 +--- a/Examples/test-suite/go/smart_pointer_typedef_runme.go ++++ b/Examples/test-suite/go/smart_pointer_typedef_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "smart_pointer_typedef" ++import . "swigtests/smart_pointer_typedef" + + func main() { + f := NewFoo() +diff --git a/Examples/test-suite/go/sneaky1_runme.go b/Examples/test-suite/go/sneaky1_runme.go +index 57c779724..c17f0ffc6 100644 +--- a/Examples/test-suite/go/sneaky1_runme.go ++++ b/Examples/test-suite/go/sneaky1_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "sneaky1" ++import "swigtests/sneaky1" + + func main() { + _ = sneaky1.Add(3, 4) +diff --git a/Examples/test-suite/go/special_variable_macros_runme.go b/Examples/test-suite/go/special_variable_macros_runme.go +index 9338e6558..597c48748 100644 +--- a/Examples/test-suite/go/special_variable_macros_runme.go ++++ b/Examples/test-suite/go/special_variable_macros_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "special_variable_macros" ++import "swigtests/special_variable_macros" + + func main() { + name := special_variable_macros.NewName() +diff --git a/Examples/test-suite/go/static_const_member_2_runme.go b/Examples/test-suite/go/static_const_member_2_runme.go +index ff8cbbbcd..7586eb404 100644 +--- a/Examples/test-suite/go/static_const_member_2_runme.go ++++ b/Examples/test-suite/go/static_const_member_2_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "static_const_member_2" ++import . "swigtests/static_const_member_2" + + func main() { + _ = NewTest_int() +diff --git a/Examples/test-suite/go/struct_initialization_runme.go b/Examples/test-suite/go/struct_initialization_runme.go +index a815bd3f5..d5eb4e968 100644 +--- a/Examples/test-suite/go/struct_initialization_runme.go ++++ b/Examples/test-suite/go/struct_initialization_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "struct_initialization" ++import . "swigtests/struct_initialization" + + func main() { + if GetInstanceC1().GetX() != 10 { +diff --git a/Examples/test-suite/go/struct_rename_runme.go b/Examples/test-suite/go/struct_rename_runme.go +index de99fc320..6d619e090 100644 +--- a/Examples/test-suite/go/struct_rename_runme.go ++++ b/Examples/test-suite/go/struct_rename_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "struct_rename" ++import "swigtests/struct_rename" + + func main() { + _ = struct_rename.NewBar() +diff --git a/Examples/test-suite/go/struct_value_runme.go b/Examples/test-suite/go/struct_value_runme.go +index 3b5e5c1dc..c43a67a88 100644 +--- a/Examples/test-suite/go/struct_value_runme.go ++++ b/Examples/test-suite/go/struct_value_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "struct_value" ++import "swigtests/struct_value" + + func main() { + b := struct_value.NewBar() +diff --git a/Examples/test-suite/go/template_default_arg_runme.go b/Examples/test-suite/go/template_default_arg_runme.go +index d67e63fa7..9558c7496 100644 +--- a/Examples/test-suite/go/template_default_arg_runme.go ++++ b/Examples/test-suite/go/template_default_arg_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "template_default_arg" ++import "swigtests/template_default_arg" + + func main() { + helloInt := template_default_arg.NewHello_int() +diff --git a/Examples/test-suite/go/template_extend1_runme.go b/Examples/test-suite/go/template_extend1_runme.go +index 0912fa6ed..f2469ab15 100644 +--- a/Examples/test-suite/go/template_extend1_runme.go ++++ b/Examples/test-suite/go/template_extend1_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "template_extend1" ++import "swigtests/template_extend1" + + func main() { + a := template_extend1.NewLBaz() +diff --git a/Examples/test-suite/go/template_extend2_runme.go b/Examples/test-suite/go/template_extend2_runme.go +index ced3d93cc..c3669bc95 100644 +--- a/Examples/test-suite/go/template_extend2_runme.go ++++ b/Examples/test-suite/go/template_extend2_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "template_extend2" ++import "swigtests/template_extend2" + + func main() { + a := template_extend2.NewLBaz() +diff --git a/Examples/test-suite/go/template_inherit_runme.go b/Examples/test-suite/go/template_inherit_runme.go +index a8d5126dc..10071b128 100644 +--- a/Examples/test-suite/go/template_inherit_runme.go ++++ b/Examples/test-suite/go/template_inherit_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_inherit" ++import . "swigtests/template_inherit" + + func main() { + a := NewFooInt() +diff --git a/Examples/test-suite/go/template_ns4_runme.go b/Examples/test-suite/go/template_ns4_runme.go +index 6c658ec97..c1b356b3f 100644 +--- a/Examples/test-suite/go/template_ns4_runme.go ++++ b/Examples/test-suite/go/template_ns4_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_ns4" ++import . "swigtests/template_ns4" + + func main() { + d := Make_Class_DD() +diff --git a/Examples/test-suite/go/template_ns_runme.go b/Examples/test-suite/go/template_ns_runme.go +index cfc56fa3c..e77c17bf7 100644 +--- a/Examples/test-suite/go/template_ns_runme.go ++++ b/Examples/test-suite/go/template_ns_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_ns" ++import . "swigtests/template_ns" + + func main() { + p1 := NewPairii(2, 3) +diff --git a/Examples/test-suite/go/template_opaque_runme.go b/Examples/test-suite/go/template_opaque_runme.go +index 71701df53..b3bf61043 100644 +--- a/Examples/test-suite/go/template_opaque_runme.go ++++ b/Examples/test-suite/go/template_opaque_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "template_opaque" ++import "swigtests/template_opaque" + + func main() { + v := template_opaque.NewOpaqueVectorType(int64(10)) +diff --git a/Examples/test-suite/go/template_ref_type_runme.go b/Examples/test-suite/go/template_ref_type_runme.go +index a01ce3d31..516b6c721 100644 +--- a/Examples/test-suite/go/template_ref_type_runme.go ++++ b/Examples/test-suite/go/template_ref_type_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "template_ref_type" ++import "swigtests/template_ref_type" + + func main() { + xr := template_ref_type.NewXC() +diff --git a/Examples/test-suite/go/template_rename_runme.go b/Examples/test-suite/go/template_rename_runme.go +index 6e04f8845..08cf3fb48 100644 +--- a/Examples/test-suite/go/template_rename_runme.go ++++ b/Examples/test-suite/go/template_rename_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "template_rename" ++import "swigtests/template_rename" + + func main() { + i := template_rename.NewIFoo() +diff --git a/Examples/test-suite/go/template_static_runme.go b/Examples/test-suite/go/template_static_runme.go +index f10ea78f7..205813dbf 100644 +--- a/Examples/test-suite/go/template_static_runme.go ++++ b/Examples/test-suite/go/template_static_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_static" ++import . "swigtests/template_static" + + func main() { + FooBar_double(1) +diff --git a/Examples/test-suite/go/template_tbase_template_runme.go b/Examples/test-suite/go/template_tbase_template_runme.go +index e1c46aaf7..a4832439f 100644 +--- a/Examples/test-suite/go/template_tbase_template_runme.go ++++ b/Examples/test-suite/go/template_tbase_template_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_tbase_template" ++import . "swigtests/template_tbase_template" + + func main() { + a := Make_Class_dd() +diff --git a/Examples/test-suite/go/template_type_namespace_runme.go b/Examples/test-suite/go/template_type_namespace_runme.go +index 1356f9b08..562fae78d 100644 +--- a/Examples/test-suite/go/template_type_namespace_runme.go ++++ b/Examples/test-suite/go/template_type_namespace_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_type_namespace" ++import . "swigtests/template_type_namespace" + + func main() { + if Foo().Get(0) == "" { +diff --git a/Examples/test-suite/go/template_typedef_cplx3_runme.go b/Examples/test-suite/go/template_typedef_cplx3_runme.go +index 0a2b31301..52a9bc7f6 100644 +--- a/Examples/test-suite/go/template_typedef_cplx3_runme.go ++++ b/Examples/test-suite/go/template_typedef_cplx3_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_typedef_cplx3" ++import . "swigtests/template_typedef_cplx3" + + func main() { + // this is OK +diff --git a/Examples/test-suite/go/template_typedef_cplx4_runme.go b/Examples/test-suite/go/template_typedef_cplx4_runme.go +index d8952cfb6..84347e404 100644 +--- a/Examples/test-suite/go/template_typedef_cplx4_runme.go ++++ b/Examples/test-suite/go/template_typedef_cplx4_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "template_typedef_cplx4" ++import . "swigtests/template_typedef_cplx4" + + func main() { + // this is OK +diff --git a/Examples/test-suite/go/threads_exception_runme.go b/Examples/test-suite/go/threads_exception_runme.go +index e3da1dc25..b554f0e28 100644 +--- a/Examples/test-suite/go/threads_exception_runme.go ++++ b/Examples/test-suite/go/threads_exception_runme.go +@@ -1,7 +1,7 @@ + package main + + import "strings" +-import "threads_exception" ++import "swigtests/threads_exception" + + func main() { + t := threads_exception.NewTest() +diff --git a/Examples/test-suite/go/typedef_class_runme.go b/Examples/test-suite/go/typedef_class_runme.go +index d94126d3b..157a91745 100644 +--- a/Examples/test-suite/go/typedef_class_runme.go ++++ b/Examples/test-suite/go/typedef_class_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "typedef_class" ++import "swigtests/typedef_class" + + func main() { + a := typedef_class.NewRealA() +diff --git a/Examples/test-suite/go/typedef_funcptr_runme.go b/Examples/test-suite/go/typedef_funcptr_runme.go +index 9d55f3f04..f76f088af 100644 +--- a/Examples/test-suite/go/typedef_funcptr_runme.go ++++ b/Examples/test-suite/go/typedef_funcptr_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "typedef_funcptr" ++import . "swigtests/typedef_funcptr" + + func main() { + a := 100 +diff --git a/Examples/test-suite/go/typedef_inherit_runme.go b/Examples/test-suite/go/typedef_inherit_runme.go +index 7a65569f2..f2dbb3263 100644 +--- a/Examples/test-suite/go/typedef_inherit_runme.go ++++ b/Examples/test-suite/go/typedef_inherit_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "typedef_inherit" ++import "swigtests/typedef_inherit" + + func main() { + a := typedef_inherit.NewFoo() +diff --git a/Examples/test-suite/go/typedef_scope_runme.go b/Examples/test-suite/go/typedef_scope_runme.go +index af282b16f..9c845bb69 100644 +--- a/Examples/test-suite/go/typedef_scope_runme.go ++++ b/Examples/test-suite/go/typedef_scope_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "typedef_scope" ++import "swigtests/typedef_scope" + + func main() { + b := typedef_scope.NewBar() +diff --git a/Examples/test-suite/go/typemap_namespace_runme.go b/Examples/test-suite/go/typemap_namespace_runme.go +index a2880d4a8..f0860803e 100644 +--- a/Examples/test-suite/go/typemap_namespace_runme.go ++++ b/Examples/test-suite/go/typemap_namespace_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "typemap_namespace" ++import . "swigtests/typemap_namespace" + + func main() { + if Test1("hello") != "hello" { +diff --git a/Examples/test-suite/go/typemap_ns_using_runme.go b/Examples/test-suite/go/typemap_ns_using_runme.go +index c4c21cf75..00e1131d6 100644 +--- a/Examples/test-suite/go/typemap_ns_using_runme.go ++++ b/Examples/test-suite/go/typemap_ns_using_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "typemap_ns_using" ++import "swigtests/typemap_ns_using" + + func main() { + if typemap_ns_using.Spam(37) != 37 { +diff --git a/Examples/test-suite/go/typemap_out_optimal_runme.go b/Examples/test-suite/go/typemap_out_optimal_runme.go +index 7cc3b38e3..0cccd97a6 100644 +--- a/Examples/test-suite/go/typemap_out_optimal_runme.go ++++ b/Examples/test-suite/go/typemap_out_optimal_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "typemap_out_optimal" ++import . "swigtests/typemap_out_optimal" + + func main() { + SetXXDebug(false) +diff --git a/Examples/test-suite/go/typename_runme.go b/Examples/test-suite/go/typename_runme.go +index d1665099c..1e1696d0a 100644 +--- a/Examples/test-suite/go/typename_runme.go ++++ b/Examples/test-suite/go/typename_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "typename" ++import "swigtests/typename" + + func main() { + f := typename.NewFoo() +diff --git a/Examples/test-suite/go/unions_runme.go b/Examples/test-suite/go/unions_runme.go +index b76ca5c75..6e2981192 100644 +--- a/Examples/test-suite/go/unions_runme.go ++++ b/Examples/test-suite/go/unions_runme.go +@@ -3,7 +3,7 @@ + + package main + +-import "unions" ++import "swigtests/unions" + + func main() { + // Create new instances of SmallStruct and BigStruct for later use +diff --git a/Examples/test-suite/go/using1_runme.go b/Examples/test-suite/go/using1_runme.go +index a6a6fa738..09cc381cc 100644 +--- a/Examples/test-suite/go/using1_runme.go ++++ b/Examples/test-suite/go/using1_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "using1" ++import "swigtests/using1" + + func main() { + if using1.Spam(37) != 37 { +diff --git a/Examples/test-suite/go/using2_runme.go b/Examples/test-suite/go/using2_runme.go +index f6b8d49b5..8109037f9 100644 +--- a/Examples/test-suite/go/using2_runme.go ++++ b/Examples/test-suite/go/using2_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "using2" ++import "swigtests/using2" + + func main() { + if using2.Spam(37) != 37 { +diff --git a/Examples/test-suite/go/using_composition_runme.go b/Examples/test-suite/go/using_composition_runme.go +index 712d1fad5..7ef09fef9 100644 +--- a/Examples/test-suite/go/using_composition_runme.go ++++ b/Examples/test-suite/go/using_composition_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "using_composition" ++import . "swigtests/using_composition" + + func main() { + f := NewFooBar() +diff --git a/Examples/test-suite/go/using_extend_runme.go b/Examples/test-suite/go/using_extend_runme.go +index 27d1ccc62..dac300ba4 100644 +--- a/Examples/test-suite/go/using_extend_runme.go ++++ b/Examples/test-suite/go/using_extend_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "using_extend" ++import . "swigtests/using_extend" + + func main() { + f := NewFooBar() +diff --git a/Examples/test-suite/go/using_inherit_runme.go b/Examples/test-suite/go/using_inherit_runme.go +index a88171817..c8755902f 100644 +--- a/Examples/test-suite/go/using_inherit_runme.go ++++ b/Examples/test-suite/go/using_inherit_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "using_inherit" ++import . "swigtests/using_inherit" + + func main() { + b := NewBar() +diff --git a/Examples/test-suite/go/using_private_runme.go b/Examples/test-suite/go/using_private_runme.go +index 2da62dc2e..4c86ef514 100644 +--- a/Examples/test-suite/go/using_private_runme.go ++++ b/Examples/test-suite/go/using_private_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "using_private" ++import . "swigtests/using_private" + + func main() { + f := NewFooBar() +diff --git a/Examples/test-suite/go/using_protected_runme.go b/Examples/test-suite/go/using_protected_runme.go +index 3fd5029f7..431081827 100644 +--- a/Examples/test-suite/go/using_protected_runme.go ++++ b/Examples/test-suite/go/using_protected_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "using_protected" ++import . "swigtests/using_protected" + + func main() { + f := NewFooBar() +diff --git a/Examples/test-suite/go/varargs_overload_runme.go b/Examples/test-suite/go/varargs_overload_runme.go +index 8ce580d65..50a430894 100644 +--- a/Examples/test-suite/go/varargs_overload_runme.go ++++ b/Examples/test-suite/go/varargs_overload_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "varargs_overload" ++import "swigtests/varargs_overload" + + func main() { + if varargs_overload.Vararg_over1("Hello") != "Hello" { +diff --git a/Examples/test-suite/go/varargs_runme.go b/Examples/test-suite/go/varargs_runme.go +index 60bd8829a..eb2fa94aa 100644 +--- a/Examples/test-suite/go/varargs_runme.go ++++ b/Examples/test-suite/go/varargs_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "varargs" ++import "swigtests/varargs" + + func main() { + if varargs.Test("Hello") != "Hello" { +diff --git a/Examples/test-suite/go/virtual_derivation_runme.go b/Examples/test-suite/go/virtual_derivation_runme.go +index 4e2c6e585..21135308c 100644 +--- a/Examples/test-suite/go/virtual_derivation_runme.go ++++ b/Examples/test-suite/go/virtual_derivation_runme.go +@@ -1,6 +1,6 @@ + package main + +-import . "virtual_derivation" ++import . "swigtests/virtual_derivation" + + // very innocent example + +diff --git a/Examples/test-suite/go/virtual_poly_runme.go b/Examples/test-suite/go/virtual_poly_runme.go +index 32906b391..9973f24c7 100644 +--- a/Examples/test-suite/go/virtual_poly_runme.go ++++ b/Examples/test-suite/go/virtual_poly_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "virtual_poly" ++import "swigtests/virtual_poly" + + func main() { + d := virtual_poly.NewNDouble(3.5) +diff --git a/Examples/test-suite/go/voidtest_runme.go b/Examples/test-suite/go/voidtest_runme.go +index 133545cea..35c5289fd 100644 +--- a/Examples/test-suite/go/voidtest_runme.go ++++ b/Examples/test-suite/go/voidtest_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "voidtest" ++import "swigtests/voidtest" + + func main() { + voidtest.Globalfunc() +diff --git a/Examples/test-suite/go/wrapmacro_runme.go b/Examples/test-suite/go/wrapmacro_runme.go +index a251a05e8..d792d4ffe 100644 +--- a/Examples/test-suite/go/wrapmacro_runme.go ++++ b/Examples/test-suite/go/wrapmacro_runme.go +@@ -1,6 +1,6 @@ + package main + +-import "wrapmacro" ++import "swigtests/wrapmacro" + + func main() { + a := 2 +diff --git a/configure.ac b/configure.ac +index 543274359..a38e97d2a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2370,11 +2370,6 @@ AS_HELP_STRING([--with-go=path], [Set location of Go compiler]),[GOBIN="$withval + if test x"${GOBIN}" = xno; then + AC_MSG_NOTICE([Disabling Go]) + GO= +- GOC= +- GO1=false +- GO12=false +- GO13=false +- GO15=false + GOGCC=false + GCCGO= + GOOPT= +@@ -2390,30 +2385,15 @@ else + + GOGCC=false + GCCGO= +- GO1=false +- GO12=false +- GO13=false +- GO15=false + GOOPT= + GCCGOOPT= + GOVERSIONOPTION= + + if test -n "$GO" ; then +- GO1=true +- GOVERSIONOPTION=version +- go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //') +- case "$go_version" in +- go1 | go1.[[01234]] | go1.[[01234]].*) +- GOC=$(sh -c "$(go env) && echo \$GOCHAR")c +- ;; +- *) +- GOC=compile +- ;; +- esac + AC_MSG_CHECKING([whether go version is too old]) + case $go_version in +- go1.1.* | go1.1 | go1.0 | go1.0.* | go1 ) +- AC_MSG_RESULT([yes - minimum version is 1.2]) ++ go1.[012345]*) ++ AC_MSG_RESULT([yes - minimum version is 1.6]) + GO= + GOOPT="-intgosize 32" + ;; +@@ -2429,20 +2409,6 @@ else + esac + ;; + esac +- case $go_version in +- go1.0 | go1.0.* | go1 | go1.1 | go1.1.*) +- GOOPT="$GOOPT -use-shlib" +- ;; +- go1.2 | go1.2.*) +- GO12=true +- ;; +- go1.3 | go1.3.* | go1.4 | go1.4.*) +- GO13=true +- ;; +- *) +- GO15=true +- ;; +- esac + fi + + AC_CHECK_PROGS(GCCGO, gccgo) +-- +2.20.1 + diff --git a/swig400-Restore-setting-of-GOVERSIONOPTION.patch b/swig400-Restore-setting-of-GOVERSIONOPTION.patch new file mode 100644 index 0000000..d66b0fa --- /dev/null +++ b/swig400-Restore-setting-of-GOVERSIONOPTION.patch @@ -0,0 +1,25 @@ +From 6b108c19e1504c937e1a7d50147575dd8e624b73 Mon Sep 17 00:00:00 2001 +From: Ian Lance Taylor +Date: Thu, 8 Aug 2019 22:59:57 -0700 +Subject: [PATCH 2/2] Restore setting of GOVERSIONOPTION + +Accidentally removed in last commit. +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index a38e97d2a..73c38a72c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2390,6 +2390,7 @@ else + GOVERSIONOPTION= + + if test -n "$GO" ; then ++ GOVERSIONOPTION=version + AC_MSG_CHECKING([whether go version is too old]) + case $go_version in + go1.[012345]*) +-- +2.20.1 +