Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 99b7a628fd6639cea7ca7e81f2e00f829b47a4fb..ef31d9fced1f19665ff711938f11b9a60dde29dd 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,32 +1,64 @@
-# @configure_input@                                    -*- shell-script -*-
+# @configure_input@                                     -*- shell-script -*-

 # Configurable variable values for Bison test suite.
 
 # Configurable variable values for Bison test suite.
 

-# Copyright (C) 2000-2010 Free Software Foundation, Inc.
-
-# We need a C compiler.
-: ${CC='@CC@'}
-
-# We want no optimization.
-CFLAGS='@O0CFLAGS@ @WARN_CFLAGS_TEST@ @WERROR_CFLAGS@'
-
-# Sometimes a test group needs to ignore gcc warnings, so it locally
-# sets CFLAGS to this.
-NO_WERROR_CFLAGS='@O0CFLAGS@ @WARN_CFLAGS_TEST@'
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 # We need `config.h'.
 CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
 
 
 # We need `config.h'.
 CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
 

+## ------------------- ##
+## C/C++ Compilation.  ##
+## ------------------- ##
+
+: ${CC='@CC@'}
+: ${CXX='@CXX@'}
+

 # Is the compiler GCC?
 GCC='@GCC@'
 
 # Is the compiler GCC?
 GCC='@GCC@'
 

-# The C++ compiler.
-: ${CXX='@CXX@'}
+# We want no optimization, as they uncover warnings (therefore,
+# failures) about uninitialized variables in the test suite.  FIXME:
+# fix the warnings, not the flags.
+  O0CFLAGS=`echo '@CFLAGS@'   | sed 's/-O[0-9s] *//g'`
+O0CXXFLAGS=`echo '@CXXFLAGS@' | sed 's/-O[0-9s] *//g'`
+
+# Sometimes a test group needs to ignore gcc warnings, so it locally
+# sets CFLAGS to this.
+  NO_WERROR_CFLAGS="$O0CFLAGS   @WARN_CFLAGS@   @WARN_CFLAGS_TEST@"
+NO_WERROR_CXXFLAGS="$O0CXXFLAGS @WARN_CXXFLAGS@ @WARN_CXXFLAGS_TEST@"
+
+# But most of the time, we want -Werror.
+  CFLAGS="$NO_WERROR_CFLAGS   @WERROR_CFLAGS@"
+CXXFLAGS="$NO_WERROR_CXXFLAGS @WERROR_CXXFLAGS@"

 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 
 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 

-# We want no optimization with C++, too.
-CXXFLAGS='@O0CXXFLAGS@ @WARN_CXXFLAGS_TEST@ @WERROR_CFLAGS@'
+# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
+if "$at_arg_compile_c_with_cxx"; then
+  CC=$CXX
+  O0CFLAGS=$O0CXXFLAGS
+  NO_WERROR_CFLAGS=$NO_WERROR_CXXFLAGS
+  CFLAGS=$CXXFLAGS
+fi
+
+
+## ------- ##
+## Other.  ##
+## ------- ##

 
 # Are special link options needed?
 LDFLAGS='@LDFLAGS@'
 
 # Are special link options needed?
 LDFLAGS='@LDFLAGS@'


@@ -45,3 +77,14 @@ CONF_JAVA='@CONF_JAVA@'
 
 # We need egrep.
 : ${EGREP='@EGREP@'}
 
 # We need egrep.
 : ${EGREP='@EGREP@'}

+
+# 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