* tests/atlocal.in (GCC): Add.

* tests/calc.at: s/m4_match/m4_bmatch/.
s/m4_patsubst/m4_bpatsubst/.
(AT_CHECK_CALC): Check the compiler's stderr only if it's GCC.
* configure.in: AC_SUBST(GCC).
This commit is contained in:
Akim Demaille
2001-10-18 15:26:56 +00:00
parent 5d52e7d045
commit 3c1a79b314
5 changed files with 28 additions and 9 deletions

View File

@@ -1,3 +1,11 @@
2001-10-18 Akim Demaille <akim@epita.fr>
* tests/atlocal.in (GCC): Add.
* tests/calc.at: s/m4_match/m4_bmatch/.
s/m4_patsubst/m4_bpatsubst/.
(AT_CHECK_CALC): Check the compiler's stderr only if it's GCC.
* configure.in: AC_SUBST(GCC).
2001-10-14 Marc Autret <autret_m@epita.fr> 2001-10-14 Marc Autret <autret_m@epita.fr>
* src/options.c (create_long_option_table): Fix. * src/options.c (create_long_option_table): Fix.

2
NEWS
View File

@@ -1,7 +1,7 @@
Bison News Bison News
---------- ----------
Changes in version 1.29d: Changes in version 1.29e:
* `--defines' and `--graph' have now an optionnal argument which is the * `--defines' and `--graph' have now an optionnal argument which is the
output file name. `-d' and `-g' do not change, they do not take any output file name. `-d' and `-g' do not change, they do not take any

View File

@@ -27,6 +27,8 @@ AM_CONFIG_HEADER(config.h:config.hin)
# Initialize the test suite. # Initialize the test suite.
AC_CONFIG_TESTDIR(tests) AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison]) AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
# Needed by tests/atlocal.in.
AC_SUBST([GCC])
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC

View File

@@ -6,5 +6,8 @@
CC='@CC@' CC='@CC@'
CFLAGS='@CFLAGS@' CFLAGS='@CFLAGS@'
# We need to know if the compiler is GCC.
GCC='@GCC@'
# We need `config.h'. # We need `config.h'.
CPPFLAGS="-I $top_builddir @CPPFLAGS@" CPPFLAGS="-I $top_builddir @CPPFLAGS@"

View File

@@ -273,8 +273,8 @@ m4_define([_AT_CHECK_CALC],
]]) ]])
AT_CHECK([calc input], 0, [], [stderr])dnl AT_CHECK([calc input], 0, [], [stderr])dnl
AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
[m4_match([$1], [--debug], [m4_bmatch([$1], [--debug],
[$3], [0]) [$3], [0])
]) ])
]) ])
@@ -302,17 +302,17 @@ AT_CHECK([calc input], 0, [], [stderr])
AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
[m4_match([$1], [--debug], [m4_bmatch([$1], [--debug],
[$3], [1]) [$3], [1])
]) ])
egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:) ' stderr >at-stderr egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:) ' stderr >at-stderr
mv at-stderr stderr mv at-stderr stderr
AT_CHECK([cat stderr], 0, AT_CHECK([cat stderr], 0,
[m4_match([$1], [--location], [$4: ])[]dnl [m4_bmatch([$1], [--location], [$4: ])[]dnl
parse error[]dnl parse error[]dnl
m4_match([$1], [--yyerror-verbose], [, $5])[]dnl m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl
]) ])
@@ -330,9 +330,15 @@ AT_SETUP([Calculator $1])
AT_DATA_CALC_Y([$1]) AT_DATA_CALC_Y([$1])
# Specify the output files to avoid problems on different file systems. # Specify the output files to avoid problems on different file systems.
AT_CHECK([bison calc.y -o calc.c m4_patsubst([$1], [--yyerror-verbose])], AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
[0], [], []) [0], [], [])
AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [])
# Some compilers issue warnings we don't want to hear about.
# Maybe some day we will have proper Autoconf macros to disable these
# warnings, but this place is not the right one for that.
# So let's keep only GCC warnings, which we know are sane.
AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
AT_CHECK([test "$GCC" = yes && cat stderr])
# Test the priorities. # Test the priorities.
_AT_CHECK_CALC([$1], _AT_CHECK_CALC([$1],