* tests/defs (required): Handle bison; set YACC automatically.

* tests/pr204.test, tests/yacc4.test, tests/yacc8.test,
tests/yaccvpath.test: Require bison.  Don't set YACC.

diff --git a/ChangeLog b/ChangeLog
index 5a7f7e7403da5014032223125d7502a751e2b8f1..1f343feeb7351a5b13c14cbcf1d78f9ee5fe0807 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-18  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * tests/defs (required): Handle bison; set YACC automatically.
+       * tests/pr204.test, tests/yacc4.test, tests/yacc8.test,
+       tests/yaccvpath.test: Require bison.  Don't set YACC.
+
 2002-06-18  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * tests/defs (required): Handle `gcc' and `g++'; automatically

diff --git a/tests/defs b/tests/defs
index 0946d124d643b319329604e1d51c5af396d3dcdc..a6bf4367d26105ce6d72c1e28083bb800959510b 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -28,6 +28,13 @@ then
   do
     # Check that each required tool is present.
     case $tool in
+      bison)
+       # Since bison is required, we pick YACC for ./configure.
+       YACC='bison -y'
+       export YACC
+       echo "$me: running bison --version"
+       ( bison --version ) || exit 77
+       ;;
       GNUmake)
        echo "$me: running $MAKE --version"
        ( $MAKE --version ) || exit 77

diff --git a/tests/pr204.test b/tests/pr204.test
index 151832dbab29c7dd0e7f7acf5803012746990c56..f15c49038620e44d91d27c50062af652cf3ef382 100755 (executable)
--- a/tests/pr204.test
+++ b/tests/pr204.test
@@ -37,10 +37,6 @@ END
 
 cp parse.y parse2.y
 
-# We are not checking Autoconf, so we pick $YACC for it.
-YACC="bison -y"
-export YACC
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/yacc4.test b/tests/yacc4.test
index a2f6c560494777b7da58621987b4db17e6386c6c..dcea3eda269ee0cc678c8161e45c327775332342 100755 (executable)
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -2,11 +2,9 @@
 
 # Some simple tests of ylwrap functionality.
 
-required=gcc
+required='bison gcc'
 . $srcdir/defs || exit 1
 
-(bison -V) > /dev/null 2>&1 || exit 77
-
 cat > configure.in << 'END'
 AC_INIT
 AC_CONFIG_AUX_DIR([.])
@@ -48,12 +46,6 @@ cat > foo.c << 'END'
 int main () { return 0; }
 END
 
-# We are not checking Autoconf, so we pick $YACC for it.
-YACC="bison -y"
-export YACC
-
-$YACC --version || exit 77
-
 set -e
 
 $ACLOCAL

diff --git a/tests/yacc8.test b/tests/yacc8.test
index 610f8a969407b5a9906e5d8488b188febc421b37..72ff5a851fb403fb56c78b23cde2d971534e4b24 100755 (executable)
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -34,10 +34,6 @@ void yyerror (char *s) {}
 foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
 END
 
-# We are not checking Autoconf, so we pick $YACC for it.
-YACC="bison -y"
-export YACC
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 60e9caf73e89c3b94c03f4ff5fd5c11cd8204387..b7b275fd459eb7593a2a7c7b661caa2150e0df28 100755 (executable)
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -7,11 +7,9 @@
 # to be distributed is up to date.
 
 # Require GNU make for `make distdir'
-required='GNUmake gcc'
+required='GNUmake gcc bison'
 . $srcdir/defs || exit 1
 
-(bison -V) > /dev/null 2>&1 || exit 77
-
 cat > configure.in << 'END'
 AC_INIT
 AC_CONFIG_AUX_DIR([.])
@@ -42,10 +40,6 @@ cat > foo.c << 'END'
 int main () { return 0; }
 END
 
-# We are not checking Autoconf, so we pick $YACC for it.
-YACC="bison -y"
-export YACC
-
 set -e
 
 $ACLOCAL