From ac3f2e33b464a168b84ddb8a2da2195a6656dd19 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Fri, 23 Mar 2012 16:05:15 +0100
Subject: [PATCH] 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.
---
 tests/atlocal.in |  7 +++++++
 tests/local.at   | 11 +++++++++++
 tests/local.mk   |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/atlocal.in b/tests/atlocal.in
index b66e9543..0b888d16 100644
--- 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 a8b38762..2e975d0a 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -634,4 +634,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])
diff --git a/tests/local.mk b/tests/local.mk
index 183c371d..12668c41 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -97,8 +97,8 @@ installcheck-local: $(RUN_TESTSUITE_deps)
 
 # Be real mean with it.
 .PHONY: maintainer-check-g++
-	$(RUN_TESTSUITE) CC='$(CXX)'
 maintainer-check-g++: $(RUN_TESTSUITE_deps)
+	$(RUN_TESTSUITE) --compile-c-with-cxx
 
 .PHONY: maintainer-check-posix
 maintainer-check-posix: $(RUN_TESTSUITE_deps)
-- 
2.47.2