[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 9/9] tests: adjust to case where the C compiler is actually a C++
From: |
Akim Demaille |
Subject: |
[PATCH 9/9] tests: adjust to case where the C compiler is actually a C++ compiler |
Date: |
Wed, 18 Jul 2012 11:02:31 +0200 |
* tests/atlocal.in (CC_IS_CXX): New.
* tests/headers.at (Several parsers): Use it.
---
tests/atlocal.in | 3 +++
tests/headers.at | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 7302209..d059d63 100644
--- 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 07f1d1b..cac7fe5 100644
--- 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])
--
1.7.11.2
- [PATCH 0/9] {maint} maint: improve test suite, Akim Demaille, 2012/07/18
- [PATCH 5/9] tests: be sure that backups are safe., Akim Demaille, 2012/07/18
- [PATCH 7/9] doc: fix Texinfo command, Akim Demaille, 2012/07/18
- [PATCH 9/9] tests: adjust to case where the C compiler is actually a C++ compiler,
Akim Demaille <=
- [PATCH 4/9] maint: dead comment., Akim Demaille, 2012/07/18
- [PATCH 8/9] tests: fix dependencies, Akim Demaille, 2012/07/18
- [PATCH 6/9] maint: Valgrind on OS X., Akim Demaille, 2012/07/18
- [PATCH 1/9] maint: fix syntax-check ignore patterns., Akim Demaille, 2012/07/18
- [PATCH 2/9] tests: refactor the bison invocations., Akim Demaille, 2012/07/18
- [PATCH 3/9] tests: refactor for legibility., Akim Demaille, 2012/07/18