summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2013-07-03 17:16:04 +0200
committerAkim Demaille <akim@lrde.epita.fr>2013-07-03 17:18:54 +0200
commitb7171c45f4eab4d06810d7e9617193cf62d08d38 (patch)
treed250b0307d4908c12c04efc2cd67d50adb135495
parentac953ff80a6c243a941bdeeba6c05ea5f8c54c43 (diff)
downloadbison-b7171c45f4eab4d06810d7e9617193cf62d08d38.tar.gz
tests: skip C++ tests if we can't compile a simple program
There are possible conflicts between gnulib replacement functions (in <stdio.h>) and their C++ wrappers (in <stream>). Trying to address these in configure seems too hard, and I don't know how to fix the issue in gnulib. Cowardly avoid the problem by skipping C++ tests when this happens. Reported by Stefano Lattarini. http://lists.gnu.org/archive/html/bug-bison/2013-06/msg00001.html * tests/atlocal.in (BISON_CXX_WORKS): Also set it to "skip" if we can't compile a simple program using <stream>. * tests/local.at: Comment changes.
-rw-r--r--tests/atlocal.in31
-rw-r--r--tests/local.at7
2 files changed, 35 insertions, 3 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 763ca902..19ecfd7b 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -50,6 +50,37 @@ CXXFLAGS="$NO_WERROR_CXXFLAGS @WERROR_CXXFLAGS@"
# If 'exit 77'; skip all C++ tests; otherwise ':'.
BISON_CXX_WORKS='@BISON_CXX_WORKS@'
+# Be sure that the C++ compiler is not broken because of gnulib. This
+# cannot be checked in configure (gnulib is not parameterized yet),
+# and checking this in every C++ test in AC_COMPILE_CXX is too costly.
+#
+# http://lists.gnu.org/archive/html/bug-bison/2013-06/msg00001.html
+#
+# FIXME: Check (say 2014) whether this is still needed.
+if $BISON_CXX_WORKS; then
+ # See AT_DATA_SOURCE_PROLOGUE.
+ cat >conftest.cc <<EOF
+#include <config.h>
+/* We don't need perfect functions for these tests. */
+#undef malloc
+#undef memcmp
+#undef realloc
+#include <iostream>
+
+int main ()
+{
+ std::cout << "Works" << std::endl;
+}
+EOF
+ ls
+ $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS $LIBS -o conftest conftest.cc
+ case $? in
+ 0);;
+ *) BISON_CXX_WORKS="as_fn_error 77 cannot-compile-simple-program";;
+ esac
+ rm -f conftest*
+fi
+
# Whether the compiler supports POSIXLY_CORRECT defined.
: ${C_COMPILER_POSIXLY_CORRECT='@C_COMPILER_POSIXLY_CORRECT@'}
: ${CXX_COMPILER_POSIXLY_CORRECT='@CXX_COMPILER_POSIXLY_CORRECT@'}
diff --git a/tests/local.at b/tests/local.at
index e6afd36d..7948faa5 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -339,9 +339,9 @@ m4_define([AT_LANG_DISPATCH],
# AT_DATA_SOURCE_PROLOGUE
-# ------------------------
+# -----------------------
# The prologue that should be included in any source code that is
-# meant to be compiled.
+# meant to be compiled. Keep atlocal.in sync (BISON_CXX_WORKS).
m4_define([AT_DATA_SOURCE_PROLOGUE],
[[#include <config.h>
/* We don't need perfect functions for these tests. */
@@ -754,6 +754,7 @@ AT_CHECK(m4_join([ ],
[m4_bmatch([$1], [[.]], [], [$LIBS])]),
0, [ignore], [ignore])])
+
# AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc])
# ---------------------------------------------
# Compile SOURCES into OUTPUT. If the C++ compiler does not work,
@@ -761,7 +762,7 @@ AT_CHECK(m4_join([ ],
#
# If OUTPUT does not contain '.', assume that we are linking too,
# otherwise pass "-c"; this is a hack. The default SOURCES is OUTPUT
-# with trailing .o removed, and ".cc" appended.
+# with trailing ".o" removed, and ".cc" appended.
m4_define([AT_COMPILE_CXX],
[AT_KEYWORDS(c++)
AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore)