tests: when using the C++ compiler, use its flags too.

* tests/local.at: Go for colors.
(--compile-c-with-cxx): New option.
We used to pass "CC=$CXX" as command line argument,
but it was not possible to adjust CFLAGS accordingly
in atlocal, since it is loaded before assignments on
the command line are honored (so that the command line
takes precedence).
* tests/atlocal.in: Implement it.
* tests/local.mk: Use it.
(cherry picked from commit ac3f2e33b464a168b84ddb8a2da2195a6656dd19)

Conflicts:

	tests/local.mk

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc59d6601482e7c327b82e38dc09d0c8455bdae5..7a2139df4ca2b79ef61a3cf9468f169697231627 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -78,7 +78,7 @@ installcheck-local:
 # Be real mean with it.
 .PHONY: maintainer-check-g++
 maintainer-check-g++: $(TESTSUITE)
-       $(TESTSUITE) CC='$(CXX)'
+       $(TESTSUITE) --compile-c-with-cxx
 
 .PHONY: maintainer-check-posix
 maintainer-check-posix: $(TESTSUITE)

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 8f5b1a90bd26ddd553b8f679da033bf1ae17fac1..11554b33a263e88714d5e17630ab4986ba932242 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -62,3 +62,10 @@ CONF_JAVA='@CONF_JAVA@'
 # Use simple quotes (lib/quote.c).
 LC_CTYPE=C
 export LC_CTYPE
+
+
+# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
+if "$at_arg_compile_c_with_cxx"; then
+  CC=$CXX
+  CFLAGS=$CXXFLAGS
+fi

diff --git a/tests/local.at b/tests/local.at
index dd4cd5559cdc040c696c757587284359c6ad220c..462301db13912acc0283391d4abdcb61705a3a9d 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -629,4 +629,15 @@ m4_popdef([AT_COND_CASE])])
 
 AT_INIT
 
+# Cannot assign CC and CFLAGS here, since atlocal is loaded after
+# options are processed, so we don't know the value of CXX and
+# CXXFLAGS yet.
+#
+# Note that it also means that command line values for CXX and
+# CXXFLAGS will not be propagated to CC and CFLAGS.
+AT_ARG_OPTION([compile-c-with-cxx],
+              [compile C parsers with the C++ compiler])
+
+AT_COLOR_TESTS
+
 AT_TESTED([bison])