summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2022-03-27 19:34:20 +0100
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2022-03-27 19:34:20 +0100
commit5cc4591ae77416d8f8be23fa7d5a622eba5e8240 (patch)
tree5dc24e4e19daa77f28c881b83107eab7013caba3
parent27d6f5c2fef0abe43208cbb6a2f4f11e1e144881 (diff)
downloadswig-5cc4591ae77416d8f8be23fa7d5a622eba5e8240.tar.gz
Consistent cpp11 testing in test-suite
Move HAVE_CXX11 into makefiles so that running test-suite from top level directory or in the language's test-suite directory is consistent. For example, running 'make check-java-test-suite' behaves the same as 'cd Examples/test-suite/java && make check'.
-rw-r--r--Examples/test-suite/cffi/Makefile.in1
-rw-r--r--Examples/test-suite/csharp/Makefile.in1
-rw-r--r--Examples/test-suite/d/Makefile.in1
-rw-r--r--Examples/test-suite/errors/Makefile.in1
-rw-r--r--Examples/test-suite/go/Makefile.in1
-rw-r--r--Examples/test-suite/guile/Makefile.in1
-rw-r--r--Examples/test-suite/java/Makefile.in1
-rw-r--r--Examples/test-suite/javascript/Makefile.in1
-rw-r--r--Examples/test-suite/lua/Makefile.in1
-rw-r--r--Examples/test-suite/mzscheme/Makefile.in1
-rw-r--r--Examples/test-suite/ocaml/Makefile.in1
-rw-r--r--Examples/test-suite/octave/Makefile.in1
-rw-r--r--Examples/test-suite/perl5/Makefile.in1
-rw-r--r--Examples/test-suite/php/Makefile.in1
-rw-r--r--Examples/test-suite/python/Makefile.in1
-rw-r--r--Examples/test-suite/r/Makefile.in1
-rw-r--r--Examples/test-suite/ruby/Makefile.in1
-rw-r--r--Examples/test-suite/scilab/Makefile.in1
-rw-r--r--Examples/test-suite/tcl/Makefile.in1
-rw-r--r--Makefile.in3
20 files changed, 20 insertions, 2 deletions
diff --git a/Examples/test-suite/cffi/Makefile.in b/Examples/test-suite/cffi/Makefile.in
index b2e86e102..1ce64675a 100644
--- a/Examples/test-suite/cffi/Makefile.in
+++ b/Examples/test-suite/cffi/Makefile.in
@@ -6,6 +6,7 @@ LANGUAGE = cffi
CFFI = @CFFIBIN@
SCRIPTSUFFIX = _runme.lisp
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index 02dcaafb0..74010c284 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -8,6 +8,7 @@ CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
CSHARPCILINTERPRETER_FLAGS = @CSHARPCILINTERPRETER_FLAGS@
CSHARPCONVERTPATH = @top_srcdir@/@CSHARPCONVERTPATH@
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@
diff --git a/Examples/test-suite/d/Makefile.in b/Examples/test-suite/d/Makefile.in
index a20cfb4e3..e6b4e2d18 100644
--- a/Examples/test-suite/d/Makefile.in
+++ b/Examples/test-suite/d/Makefile.in
@@ -4,6 +4,7 @@
LANGUAGE = d
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@
diff --git a/Examples/test-suite/errors/Makefile.in b/Examples/test-suite/errors/Makefile.in
index 7137a6862..97c7d5c76 100644
--- a/Examples/test-suite/errors/Makefile.in
+++ b/Examples/test-suite/errors/Makefile.in
@@ -16,6 +16,7 @@
LANGUAGE = errors
ERROR_EXT = newerr
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in
index a0da7f180..67f96cf7e 100644
--- a/Examples/test-suite/go/Makefile.in
+++ b/Examples/test-suite/go/Makefile.in
@@ -12,6 +12,7 @@ SCRIPTSUFFIX = _runme.go
SO = @SO@
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/guile/Makefile.in b/Examples/test-suite/guile/Makefile.in
index 55885fc29..1fda5dc9c 100644
--- a/Examples/test-suite/guile/Makefile.in
+++ b/Examples/test-suite/guile/Makefile.in
@@ -8,6 +8,7 @@ LANGUAGE = guile
VARIANT =
SCRIPTSUFFIX = _runme.scm
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index e2a3d2472..7a34f587b 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -11,6 +11,7 @@ JAVA_TOOLS_JAR = @JAVA_TOOLS_JAR@
SCRIPTSUFFIX = _runme.java
SKIP_DOXYGEN_TEST_CASES = @JAVA_SKIP_DOXYGEN_TEST_CASES@
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@
diff --git a/Examples/test-suite/javascript/Makefile.in b/Examples/test-suite/javascript/Makefile.in
index 4f2d450e5..57b6eac75 100644
--- a/Examples/test-suite/javascript/Makefile.in
+++ b/Examples/test-suite/javascript/Makefile.in
@@ -9,6 +9,7 @@ SCRIPTSUFFIX = _runme.js
OBJEXT = @OBJEXT@
SO = @SO@
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/lua/Makefile.in b/Examples/test-suite/lua/Makefile.in
index c0730466f..2d4100d1b 100644
--- a/Examples/test-suite/lua/Makefile.in
+++ b/Examples/test-suite/lua/Makefile.in
@@ -6,6 +6,7 @@ LANGUAGE = lua
LUA = @LUABIN@
SCRIPTSUFFIX = _runme.lua
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/mzscheme/Makefile.in b/Examples/test-suite/mzscheme/Makefile.in
index e3fe17313..93dbb4ba1 100644
--- a/Examples/test-suite/mzscheme/Makefile.in
+++ b/Examples/test-suite/mzscheme/Makefile.in
@@ -6,6 +6,7 @@ LANGUAGE = mzscheme
MZSCHEME = mzscheme
SCRIPTSUFFIX = _runme.scm
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in
index 995f7f49b..79e25efcf 100644
--- a/Examples/test-suite/ocaml/Makefile.in
+++ b/Examples/test-suite/ocaml/Makefile.in
@@ -9,6 +9,7 @@ OCAMLPP = -pp "camlp4o ./swigp4.cmo"
VARIANT = _static
SCRIPTSUFFIX = _runme.ml
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/octave/Makefile.in b/Examples/test-suite/octave/Makefile.in
index 9602d85f5..81696b3ff 100644
--- a/Examples/test-suite/octave/Makefile.in
+++ b/Examples/test-suite/octave/Makefile.in
@@ -7,6 +7,7 @@ OCTAVE = @OCTAVE@
SCRIPTSUFFIX = _runme.m
PCHSUPPORT = @PCHSUPPORT@
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/perl5/Makefile.in b/Examples/test-suite/perl5/Makefile.in
index 6388e5b32..3fb3ebac6 100644
--- a/Examples/test-suite/perl5/Makefile.in
+++ b/Examples/test-suite/perl5/Makefile.in
@@ -7,6 +7,7 @@ PERL = @PERL@
SCRIPTSUFFIX = _runme.pl
TEST_RUNNER = $(srcdir)/run-perl-test.pl
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/php/Makefile.in b/Examples/test-suite/php/Makefile.in
index a31eedbee..c460bff28 100644
--- a/Examples/test-suite/php/Makefile.in
+++ b/Examples/test-suite/php/Makefile.in
@@ -5,6 +5,7 @@
LANGUAGE = php
SCRIPTSUFFIX = _runme.php
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index ccd5ca513..c061f903a 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -14,6 +14,7 @@ SCRIPTSUFFIX = _runme.py
PYCODESTYLE = @PYCODESTYLE@
PYCODESTYLE_FLAGS = --ignore=E252,E30,E402,E501,E731,E741,W291,W391
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/r/Makefile.in b/Examples/test-suite/r/Makefile.in
index 33e9d90da..484dea375 100644
--- a/Examples/test-suite/r/Makefile.in
+++ b/Examples/test-suite/r/Makefile.in
@@ -8,6 +8,7 @@ WRAPSUFFIX = .R
R_OPT = --quiet --no-save --no-restore
RUNR = R CMD BATCH $(R_OPT) '--args $(SCRIPTDIR)'
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/ruby/Makefile.in b/Examples/test-suite/ruby/Makefile.in
index f982eca1f..3b673bf71 100644
--- a/Examples/test-suite/ruby/Makefile.in
+++ b/Examples/test-suite/ruby/Makefile.in
@@ -6,6 +6,7 @@ LANGUAGE = ruby
RUBY = @RUBY@
SCRIPTSUFFIX = _runme.rb
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Examples/test-suite/scilab/Makefile.in b/Examples/test-suite/scilab/Makefile.in
index f873b8687..e1effcd64 100644
--- a/Examples/test-suite/scilab/Makefile.in
+++ b/Examples/test-suite/scilab/Makefile.in
@@ -7,6 +7,7 @@ SCILAB = @SCILAB@
SCILAB_OPT = @SCILABOPT@
SCRIPTSUFFIX = _runme.sci
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@
diff --git a/Examples/test-suite/tcl/Makefile.in b/Examples/test-suite/tcl/Makefile.in
index 322e71914..84a7299f7 100644
--- a/Examples/test-suite/tcl/Makefile.in
+++ b/Examples/test-suite/tcl/Makefile.in
@@ -6,6 +6,7 @@ LANGUAGE = tcl
TCLSH = tclsh
SCRIPTSUFFIX = _runme.tcl
+HAVE_CXX11 = @HAVE_CXX11@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
diff --git a/Makefile.in b/Makefile.in
index 6edfc240a..f4cb794d8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,6 @@ TARGET = $(TARGET_NOEXE)@EXEEXT@
SOURCE = Source
CCACHE = CCache
DOCS = Doc/Manual
-HAVE_CXX11 = @HAVE_CXX11@
swig: libfiles source ccache
@@ -249,7 +248,7 @@ check-%-test-suite:
echo warning: cannot $(ACTION) $* test-suite "(no dir $$dir)";\
else \
echo $(ACTION)ing $* test-suite; \
- (cd $$dir && $(MAKE) $(FLAGS) $(ACTION) HAVE_CXX11=$(HAVE_CXX11)) \
+ (cd $$dir && $(MAKE) $(FLAGS) $(ACTION)) \
|| passed=false; \
fi; \
test $$passed = true