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

tests: don't fail if the C++ compiler does not work

Browse Source 
Also, make sure that `make dist` generates a correct tarball even if
the C++ compiler does not work.

Reported by Nelson H. F. Beebe.

* m4/cxx.m4 (BISON_CXX_WORKS): Define to true/false instead of
true/exit 77.  The latter is too dangerous to use (it directly quits).
(ENABLE_CXX): New name for the Automake conditional, for consistency
with ENABLE_CXX11 etc.
* tests/local.at (AT_COMPILE, AT_COMPILE_CXX): Adjust to the new
semantics of BISON_CXX_WORKS.
* examples/c++/local.mk: Skip the variant test if C++ does not work.
* examples/calc++/local.mk: Likewise.
This commit is contained in:
Akim Demaille
2018-11-04 11:26:17 +01:00
parent e93c40b33d
commit cf1446dc9e
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
examples/c++/local.mk
View File

@@ -35,21 +35,25 @@ if ENABLE_CXX14
%C%_simple_CXXFLAGS = $(CXX11_CXXFLAGS) %C%_simple_CXXFLAGS = $(CXX11_CXXFLAGS)
# Don't use gnulib's system headers. # Don't use gnulib's system headers.
%C%_simple_CPPFLAGS = -I$(top_builddir) %C%_simple_CPPFLAGS = -I$(top_builddir)
dist_TESTS += %D%/simple.test TESTS += %D%/simple.test
%D%/simple.cc: $(BISON_IN) $(dist_pkgdata_DATA) %D%/simple.cc: $(BISON_IN) $(dist_pkgdata_DATA)
endif endif
EXTRA_DIST += %D%/simple.test
## ---------- ## ## ---------- ##
## Variants. ## ## Variants. ##
## ---------- ## ## ---------- ##
check_PROGRAMS += %D%/variant if ENABLE_CXX
nodist_%C%_variant_SOURCES = %D%/variant.yy check_PROGRAMS += %D%/variant
# Don't use gnulib's system headers. nodist_%C%_variant_SOURCES = %D%/variant.yy
%C%_variant_CPPFLAGS = -I$(top_builddir) # Don't use gnulib's system headers.
dist_TESTS += %D%/variant.test %C%_variant_CPPFLAGS = -I$(top_builddir)
%D%/variant.cc: $(BISON_IN) $(dist_pkgdata_DATA) TESTS += %D%/variant.test
%D%/variant.cc: $(BISON_IN) $(dist_pkgdata_DATA)
endif
EXTRA_DIST += %D%/variant.test
if ENABLE_CXX11 if ENABLE_CXX11
check_PROGRAMS += %D%/variant-11 check_PROGRAMS += %D%/variant-11
@@ -57,9 +61,10 @@ if ENABLE_CXX11
%C%_variant_11_CXXFLAGS = $(CXX11_CXXFLAGS) %C%_variant_11_CXXFLAGS = $(CXX11_CXXFLAGS)
# Don't use gnulib's system headers. # Don't use gnulib's system headers.
%C%_variant_11_CPPFLAGS = -I$(top_builddir) %C%_variant_11_CPPFLAGS = -I$(top_builddir)
dist_TESTS += %D%/variant-11.test TESTS += %D%/variant-11.test
%D%/variant-11.cc: $(BISON_IN) $(dist_pkgdata_DATA) %D%/variant-11.cc: $(BISON_IN) $(dist_pkgdata_DATA)
endif endif
EXTRA_DIST += %D%/variant-11.test
dist_cxx_DATA = %D%/README %D%/Makefile %D%/variant.yy %D%/variant-11.yy dist_cxx_DATA = %D%/README %D%/Makefile %D%/variant.yy %D%/variant-11.yy
CLEANFILES += %D%/simple.output %D%/variant.output %D%/variant-11.output CLEANFILES += %D%/simple.output %D%/variant.output %D%/variant-11.output

19
examples/calc++/local.mk
View File

@@ -65,17 +65,16 @@ calcxx_sources = \
$(calcxx_sources_generated) $(calcxx_sources_generated)
if FLEX_CXX_WORKS if FLEX_CXX_WORKS
check_PROGRAMS += %D%/calc++ if ENABLE_CXX
nodist_%C%_calc___SOURCES = \ check_PROGRAMS += %D%/calc++
$(calcxx_sources) nodist_%C%_calc___SOURCES = $(calcxx_sources)
# Don't use gnulib's system headers.
# Don't use gnulib's system headers. %C%_calc___CPPFLAGS = -I$(top_builddir)/%D%
%C%_calc___CPPFLAGS = -I$(top_builddir)/%D% %C%_calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
%C%_calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS) TESTS += %D%/calc++.test
dist_TESTS += %D%/calc++.test endif ENABLE_CXX
else endif FLEX_CXX_WORKS
EXTRA_DIST += %D%/calc++.test EXTRA_DIST += %D%/calc++.test
endif
## ------------ ## ## ------------ ##

8
m4/cxx.m4
View File

@@ -50,14 +50,12 @@ AC_DEFUN([BISON_TEST_FOR_WORKING_CXX_COMPILER],
AC_LANG_POP([C++])]) AC_LANG_POP([C++])])
case $bison_cv_cxx_works in case $bison_cv_cxx_works in
yes) yes) BISON_CXX_WORKS=':';;
BISON_CXX_WORKS=':';; no | cross) BISON_CXX_WORKS='false';;
no | cross)
BISON_CXX_WORKS='exit 77';;
esac esac
AC_SUBST([BISON_CXX_WORKS]) AC_SUBST([BISON_CXX_WORKS])
AM_CONDITIONAL(BISON_CXX_WORKS, test $bison_cv_cxx_works = yes) AM_CONDITIONAL([ENABLE_CXX], [test $bison_cv_cxx_works = yes])
]) ])
# BISON_CXX_COMPILER_POSIXLY_CORRECT # BISON_CXX_COMPILER_POSIXLY_CORRECT

6
tests/atlocal.in
View File

@@ -98,10 +98,8 @@ fi
: ${CXX_COMPILER_POSIXLY_CORRECT='@CXX_COMPILER_POSIXLY_CORRECT@'} : ${CXX_COMPILER_POSIXLY_CORRECT='@CXX_COMPILER_POSIXLY_CORRECT@'}
if $POSIXLY_CORRECT_IS_EXPORTED; then if $POSIXLY_CORRECT_IS_EXPORTED; then
$C_COMPILER_POSIXLY_CORRECT || $C_COMPILER_POSIXLY_CORRECT || BISON_C_WORKS=false
BISON_C_WORKS="as_fn_error 77 POSIXLY_CORRECT" $CXX_COMPILER_POSIXLY_CORRECT || BISON_CXX_WORKS=false
$CXX_COMPILER_POSIXLY_CORRECT ||
BISON_CXX_WORKS="as_fn_error 77 POSIXLY_CORRECT"
fi fi
# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known. # Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.

4
tests/local.at
View File

@@ -777,7 +777,7 @@ m4_define([AT_QUELL_VALGRIND],
# otherwise pass "-c"; this is a hack. The default SOURCES is OUTPUT # otherwise pass "-c"; this is a hack. The default SOURCES is OUTPUT
# with trailing .o removed, and ".c" appended. # with trailing .o removed, and ".c" appended.
m4_define([AT_COMPILE], m4_define([AT_COMPILE],
[AT_CHECK([$BISON_C_WORKS], 0, ignore, ignore) [AT_SKIP_IF([[! $BISON_C_WORKS]])
AT_CHECK(m4_join([ ], AT_CHECK(m4_join([ ],
[$CC $CFLAGS $CPPFLAGS $3], [$CC $CFLAGS $CPPFLAGS $3],
[m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])], [m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])],
@@ -797,7 +797,7 @@ AT_CHECK(m4_join([ ],
# with trailing ".o" removed, and ".cc" appended. # with trailing ".o" removed, and ".cc" appended.
m4_define([AT_COMPILE_CXX], m4_define([AT_COMPILE_CXX],
[AT_KEYWORDS(c++) [AT_KEYWORDS(c++)
AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore) AT_SKIP_IF([[! $BISON_CXX_WORKS]])
AT_CHECK(m4_join([ ], AT_CHECK(m4_join([ ],
[$CXX $CXXFLAGS $CPPFLAGS $3], [$CXX $CXXFLAGS $CPPFLAGS $3],
[m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])], [m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])],