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 459a57a90ff6fc8209498b7d5bc6e33d5e633f23)

diff --git a/bootstrap.conf b/bootstrap.conf
index f2aca47d14c6b9fb060b3a813ad58a9aa9baba19..e9b8ba6c83e55f095570af3779086beddadabfba 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -25,7 +25,6 @@ gnulib_modules='
   mbswidth obstack perror pipe-posix progname
   quote quotearg realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
   mbswidth obstack perror pipe-posix progname
   quote quotearg realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp

-  sysexits

   unistd unistd-safer unlocked-io update-copyright unsetenv verify
   warnings xalloc xalloc-die xstrndup
 
   unistd unistd-safer unlocked-io update-copyright unsetenv verify
   warnings xalloc xalloc-die xstrndup
 

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index ff3ce230cd5dd72533c726a2e7f880a15f557693..4d480d5eb751ade756396536f292797f83c3f318 100755 (executable)
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -134,8 +134,8 @@ sub calc_grammar ($$$)
     or die;
   print $out <<EOF;
 %{
     or die;
   print $out <<EOF;
 %{

+#include <assert.h>

 #include <stdio.h>
 #include <stdio.h>

-

 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/src/parse-gram.y b/src/parse-gram.y
index da0aef7133fcd3fe53f0a37edaff49fde9c2a164..33b802ed4d2deb852084c3386ec4ac552744f488 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -759,7 +759,7 @@ version_check (location const *loc, char const *version)
     {
       complain_at (*loc, "require bison %s, but have %s",
                    version, PACKAGE_VERSION);
     {
       complain_at (*loc, "require bison %s, but have %s",
                    version, PACKAGE_VERSION);

-      exit (EX_CONFIG);
+      exit (EX_MISMATCH);

     }
 }
 
     }
 }
 

diff --git a/src/system.h b/src/system.h
index 1c02f25366d6adc072af3bc46a3c9da83147e028..9191b55608cb3168569ebef049a0838ce5e804d8 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -52,7 +52,8 @@
 typedef size_t uintptr_t;
 #endif
 
 typedef size_t uintptr_t;
 #endif
 

-#include <sysexits.h>
+// Version mismatch.
+#define EX_MISMATCH 63

 
 /*---------.
 | Gnulib.  |
 
 /*---------.
 | Gnulib.  |

diff --git a/tests/calc.at b/tests/calc.at
index f0e30ad36b495dee52a81e0cdcc6e80358a8bb2a..455cd72f179a93962274b54da5fc02d7f994f6fe 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -207,6 +207,7 @@ extern FILE *input;]AT_SKEL_CC_IF([[
 
 %code
 {
 
 %code
 {

+#include <assert.h>

 #include <stdlib.h>
 #include <string.h>
 #if HAVE_UNISTD_H
 #include <stdlib.h>
 #include <string.h>
 #if HAVE_UNISTD_H

diff --git a/tests/named-refs.at b/tests/named-refs.at
index 35c2382b96597505e2c9967bd62f604a4ead3114..d2942cfcbb55b51cb46cfc4bfe8bc6fad674d34d 100644 (file)
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>