tests: fix regressions.

Exit status 63 is documented for version-mismatch.
	* bootstrap.conf (gnulib_modules): Remove sysexits.
	* src/system.h (EX_MISMATCH): Define.
	* src/parse-gram.y (version_check): Use it instead of EX_CONFIG.

Missing includes.
	* tests/calc.at, tests/named-refs.at: Include assert.h.
(cherry picked from commit 459a57a90f)
This commit is contained in:
Akim Demaille
2012-02-21 15:38:09 +01:00
parent 71cbc1ac1a
commit da209f943b
6 changed files with 6 additions and 4 deletions

View File

@@ -25,7 +25,6 @@ gnulib_modules='
mbswidth obstack perror pipe-posix progname mbswidth obstack perror pipe-posix progname
quote quotearg realloc-posix quote quotearg realloc-posix
spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
sysexits
unistd unistd-safer unlocked-io update-copyright unsetenv verify unistd unistd-safer unlocked-io update-copyright unsetenv verify
warnings xalloc xalloc-die xstrndup warnings xalloc xalloc-die xstrndup

View File

@@ -134,8 +134,8 @@ sub calc_grammar ($$$)
or die; or die;
print $out <<EOF; print $out <<EOF;
%{ %{
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>

View File

@@ -759,7 +759,7 @@ version_check (location const *loc, char const *version)
{ {
complain_at (*loc, "require bison %s, but have %s", complain_at (*loc, "require bison %s, but have %s",
version, PACKAGE_VERSION); version, PACKAGE_VERSION);
exit (EX_CONFIG); exit (EX_MISMATCH);
} }
} }

View File

@@ -52,7 +52,8 @@
typedef size_t uintptr_t; typedef size_t uintptr_t;
#endif #endif
#include <sysexits.h> // Version mismatch.
#define EX_MISMATCH 63
/*---------. /*---------.
| Gnulib. | | Gnulib. |

View File

@@ -207,6 +207,7 @@ extern FILE *input;]AT_SKEL_CC_IF([[
%code %code
{ {
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H

View File

@@ -23,6 +23,7 @@ AT_SETUP([Tutorial calculator])
AT_DATA_GRAMMAR([test.y], AT_DATA_GRAMMAR([test.y],
[[ [[
%{ %{
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>