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 ac3f2e33b4)

Conflicts:

	tests/local.mk
This commit is contained in:
Akim Demaille
2012-03-23 16:05:15 +01:00
parent 84c1cdc71d
commit c84134b644
3 changed files with 19 additions and 1 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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])