Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 09:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* tests/atlocal.in (CC_IS_CXX): New.
* tests/headers.at (Several parsers): Use it.
This commit is contained in:
Akim Demaille
2012-07-17 15:20:11 +02:00
parent d5c20d1a36
commit 0e98a81e00
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/atlocal.in
View File

@@ -49,10 +49,13 @@ BISON_CXX_WORKS='@BISON_CXX_WORKS@'
# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known. # Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
if "$at_arg_compile_c_with_cxx"; then if "$at_arg_compile_c_with_cxx"; then
CC_IS_CXX=1
CC=$CXX CC=$CXX
O0CFLAGS=$O0CXXFLAGS O0CFLAGS=$O0CXXFLAGS
NO_WERROR_CFLAGS=$NO_WERROR_CXXFLAGS NO_WERROR_CFLAGS=$NO_WERROR_CXXFLAGS
CFLAGS=$CXXFLAGS CFLAGS=$CXXFLAGS
else
CC_IS_CXX=0
fi fi

10
tests/headers.at
View File

@@ -182,8 +182,12 @@ AT_BISON_OPTION_POPDEFS
AT_DATA([main.cc], AT_DATA([main.cc],
[AT_DATA_SOURCE_PROLOGUE [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 "x1.h"
#include "x2.h" #include "x2.h"
#include "x3.h" #include "x3.h"
@@ -191,7 +195,9 @@ AT_DATA([main.cc],
#include "x6.h" #include "x6.h"
#include "x7.h" #include "x7.h"
#include "x8.h" #include "x8.h"
#if ! CC_IS_CXX
} }
#endif
#include "x5.hh" #include "x5.hh"
//#include "x6.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([x8], [%define api.pure %define api.push-pull both])
#AT_TEST([x5], [%locations %language "c++" %glr-parser]) #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]]) AT_CHECK([./parser], [0], [[expout]])
m4_popdef([AT_TEST]) m4_popdef([AT_TEST])