From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 18 Jun 2002 19:55:51 +0000 (+0000)
Subject: * tests/defs (required): Handle bison; set YACC automatically.
X-Git-Tag: Release-1-6b~55
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=05cc9b6be81e3084d3ff83bbd1d904a89bd9540f;p=automake.git

* 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 5a7f7e74..1f343fee 100644
--- 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 0946d124..a6bf4367 100644
--- 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 151832db..f15c4903 100755
--- 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 a2f6c560..dcea3eda 100755
--- 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 610f8a96..72ff5a85 100755
--- 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 60e9caf7..b7b275fd 100755
--- 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