tests: adjust to case where the C compiler is actually a C++ compiler

* tests/atlocal.in (CC_IS_CXX): New.
* tests/headers.at (Several parsers): Use it.

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 7302209f228e3f19a24956284cfbd3a4285e596a..d059d630bf744ae1d83d6a5324257238740fa73c 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -49,10 +49,13 @@ BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 
 # Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
 if "$at_arg_compile_c_with_cxx"; then
+  CC_IS_CXX=1
   CC=$CXX
   O0CFLAGS=$O0CXXFLAGS
   NO_WERROR_CFLAGS=$NO_WERROR_CXXFLAGS
   CFLAGS=$CXXFLAGS
+else
+  CC_IS_CXX=0
 fi
 
 

diff --git a/tests/headers.at b/tests/headers.at
index 07f1d1bc9359e7d44595714fbf4eebb7611ae745..cac7fe5fc6ff6fc847ff0b434884507719b463ce 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -182,8 +182,12 @@ AT_BISON_OPTION_POPDEFS
 
 AT_DATA([main.cc],
 [AT_DATA_SOURCE_PROLOGUE
-[extern "C"
+[// If we are compiling with CC=$CXX, then do not load the C headers
+// inside extern "C", since they were _not_ compiled this way.
+#if ! CC_IS_CXX
+extern "C"
 {
+#endif
   #include "x1.h"
   #include "x2.h"
   #include "x3.h"
@@ -191,7 +195,9 @@ AT_DATA([main.cc],
   #include "x6.h"
   #include "x7.h"
   #include "x8.h"
+#if ! CC_IS_CXX
 }
+#endif
 #include "x5.hh"
 //#include "x6.hh"
 
@@ -230,7 +236,7 @@ AT_TEST([x7], [%define api.push-pull both])
 AT_TEST([x8], [%define api.pure %define api.push-pull both])
 #AT_TEST([x5], [%locations %language "c++" %glr-parser])
 
-AT_COMPILE_CXX([parser], [[x[1-8].o main.cc]])
+AT_COMPILE_CXX([parser], [[x[1-8].o -DCC_IS_CXX=$CC_IS_CXX main.cc]])
 AT_CHECK([./parser], [0], [[expout]])
 
 m4_popdef([AT_TEST])