* tests/defs (required): Handle `GNUmake'.

(needs_gnu_make): Don't define anymore.
* tests/cond4.test, tests/cond18.test, tests/cond19.test,
tests/dollar.test, tests/exsource.test, tests/extra6.test,
tests/lex3.test, tests/make.test, tests/pr9.test, tests/pr87.test,
tests/subdir5.test, tests/target-cflags.test, tests/yacc7.test,
tests/yaccvpath.test: Use `required=GNUmake' instead of
`$needs_gnu_make'.

diff --git a/ChangeLog b/ChangeLog
index 9eb350659607db5c556790c55d14d1d6cb7922e3..d6fd296e244363fd389634a9c105cc1093b4081d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-18  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * tests/defs (required): Handle `GNUmake'.
+       (needs_gnu_make): Don't define anymore.
+       * tests/cond4.test, tests/cond18.test, tests/cond19.test,
+       tests/dollar.test, tests/exsource.test, tests/extra6.test,
+       tests/lex3.test, tests/make.test, tests/pr9.test, tests/pr87.test,
+       tests/subdir5.test, tests/target-cflags.test, tests/yacc7.test,
+       tests/yaccvpath.test: Use `required=GNUmake' instead of
+       `$needs_gnu_make'.
+
 2002-06-17  Paolo Bonzini  <bonzini@gnu.org>
 
        * automake.in (process_option_list): Recognize std-options.

diff --git a/tests/cond18.test b/tests/cond18.test
index fe1e9a74faf01e5ff297e257dcdb7032f0189af8..8cac3065215d5519b9c43e92dcff2bd0258ae14c 100755 (executable)
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -3,6 +3,7 @@
 # Regression test for substitution references to conditional variables.
 # Report from Richard Boulton
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
@@ -44,8 +45,6 @@ END
 CFLAGS=
 export CFLAGS
 
-$needs_gnu_make
-
 set -e
 
 $ACLOCAL

diff --git a/tests/cond19.test b/tests/cond19.test
index 95826fc72c4624a09797408739e091d1c3636c2a..8108d29a7512b7c1f3e65eb05fbe24314fe6575b 100755 (executable)
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -3,6 +3,7 @@
 # Regression test for substitution references to conditional variables.
 # Report from Richard Boulton
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
@@ -46,8 +47,6 @@ END
 CFLAGS=
 export CFLAGS
 
-$needs_gnu_make
-
 set -e
 
 $ACLOCAL

diff --git a/tests/cond4.test b/tests/cond4.test
index 7b99288afe6946bd9d6bae463ced5eb78e062a0d..15e89f86cb9d18e03646ac03b409cbd46d3f6791 100755 (executable)
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -2,6 +2,7 @@
 
 # Another sources-in-conditional test.  Report from Tim Goodwin.
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
@@ -43,8 +44,6 @@ $AUTOCONF || exit 1
 CFLAGS=
 export CFLAGS
 
-$needs_gnu_make
-
 CC='gcc' CONDITION1=true CONDITION2=true ./configure || exit 1
 msgtt=`$MAKE --no-print-directory echo-objects`
 CC='gcc' CONDITION1=true CONDITION2=false ./configure || exit 1

diff --git a/tests/defs b/tests/defs
index dcfa97c20fb5f4316f21f14de6e3ca7781132c04..684126ea6883b6c206bae0a50997b5bd9500d6ba 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -16,12 +16,28 @@ test -z "$VERBOSE" && {
    exec > /dev/null 2>&1
 }
 
+# User can override various tools used.
+test -z "$PERL" && PERL=perl
+test -z "$MAKE" && MAKE=make
+test -z "$AUTOCONF" && AUTOCONF=autoconf
+test -z "$AUTOHEADER" && AUTOHEADER=autoheader
+
 if test -n "$required"
 then
   for tool in $required
   do
-    echo "$me: running $tool --version"
-    ( $tool --version ) || exit 77
+    # Check that each required tool is present.
+    case $tool in
+      GNUmake)
+       echo "$me: running $MAKE --version"
+       ( $MAKE --version ) || exit 77
+       ;;
+      # Generic case: the tool must support --version.
+      *)
+       echo "$me: running $tool --version"
+       ( $tool --version ) || exit 77
+       ;;
+    esac
   done
 fi
 
@@ -60,12 +76,6 @@ AC_PROG_MAKE_SET
 AC_CONFIG_FILES([Makefile])
 END
 
-# User can set PERL to change the perl interpreter used.
-test -z "$PERL" && PERL=perl
-
-# User can set MAKE to choose which make to use.  Must use GNU make.
-test -z "$MAKE" && MAKE=make
-
 # Unset some MAKE... variables that may cause $MAKE to act like a
 # recursively invoked sub-make.  Any $MAKE invocation in a test is
 # conceptually an independent invocation, not part of the main
@@ -75,17 +85,6 @@ unset MAKEFLAGS
 unset MAKELEVEL
 unset DESTDIR
 
-if ($MAKE --version) > /dev/null 2>&1; then
-   needs_gnu_make=:
-else
-   needs_gnu_make='exit 77'
-fi
-
-# User can set which tools from Autoconf to use.
-test -z "$AUTOCONF" && AUTOCONF=autoconf
-test -z "$AUTOHEADER" && AUTOHEADER=autoheader
-
-
 echo "=== Running test $0"
 
 # See how Automake should be run.  We put --foreign as the default

diff --git a/tests/dollar.test b/tests/dollar.test
index f4faf256802018ef430875757212969675252d03..af084a39e328efe0512d458c9a4c71824cba18e1 100755 (executable)
--- a/tests/dollar.test
+++ b/tests/dollar.test
@@ -4,11 +4,10 @@
 # Java people need this.
 # PR/317, reported by Eric Siegerman and Philip Fong.
 
-. $srcdir/defs
-
 # Require GNU make for this test.  SunOS Make does not support
 # `$$' in a target or a dependency (it outputs the empty string instead).
-$needs_gnu_make
+required=GNUmake
+. $srcdir/defs
 
 set -e
 

diff --git a/tests/exsource.test b/tests/exsource.test
index 46f0798f771cdb2bcd5c77da135ea81c530e68e3..8b7749da41326d78ea1288a8e2e5ace6db85bec9 100755 (executable)
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -3,10 +3,9 @@
 # Test to make sure EXTRA_..._SOURCES actually works.
 # Bug report from Henrik Frystyk Nielsen.
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
-$needs_gnu_make
-
 cat >> configure.in << 'END'
 AC_PROG_CC
 END

diff --git a/tests/extra6.test b/tests/extra6.test
index b0f5d7b55cc35d2dc4932e101d224188e41a65fe..ed4a9fcc6f6c61b27f66e901f6bad42d0f5e17a2 100755 (executable)
--- a/tests/extra6.test
+++ b/tests/extra6.test
@@ -3,10 +3,9 @@
 # Check to make sure EXTRA_DIST can contain a directory or
 # a subdirectory, in $(builddir) or $(srcdir).
 
-. $srcdir/defs || exit 1
-
 # 'make distdir' + VPATH does not work with Solaris make.
-$needs_gnu_make
+required=GNUmake
+. $srcdir/defs || exit 1
 
 set -e
 

diff --git a/tests/lex3.test b/tests/lex3.test
index f110ea3063fbda76f36065639976158cbbecc4df..be6c31d64d51a88a0ead193342ec061df3feeab9 100755 (executable)
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -3,11 +3,9 @@
 # Test associated with PR 19.
 # From Matthew D. Langston.
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
-# Likewise for GNU Make (we need VPATH support for `make distcheck').
-$needs_gnu_make
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 

diff --git a/tests/make.test b/tests/make.test
index 6cc511913a1399f101457b84bdea7f87840b359d..ca7ea4e3ac0f3d0b345128287b90db3a41c05ae7 100755 (executable)
--- a/tests/make.test
+++ b/tests/make.test
@@ -3,6 +3,7 @@
 # Test to make sure `make' check works.
 # From Ralf Corsepius.
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
@@ -14,8 +15,6 @@ END
 
 : > Makefile.am
 
-$needs_gnu_make
-
 set -e
 
 $ACLOCAL

diff --git a/tests/pr87.test b/tests/pr87.test
index fbad97637305669ce25dd2375744a025f04b00bc..80499e9398ff75f1a87aa42ad0068a2d9cea42d6 100755 (executable)
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -2,10 +2,10 @@
 
 # Test for PR automake/87.
 
+# Require GNU make for `make distcheck'
+required=GNUmake
 . $srcdir/defs || exit 1
 
-$needs_gnu_make                        # for `make distcheck'
-
 subdirs="foo bar"
 
 for i in $subdirs; do

diff --git a/tests/pr9.test b/tests/pr9.test
index 5fa6abd86123e939cbbab1fa72ba2864ae21a80d..9a9455fa553e850e5c45417d0797814a1ec71267 100755 (executable)
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -2,6 +2,8 @@
 
 # Test for bug in PR 9.
 
+# `distcheck' requires GNU make.
+required='GNUmake gzip'
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
@@ -15,12 +17,6 @@ END
 
 mkdir support
 
-# Likewise for gzip.
-(gzip --version) > /dev/null 2>&1 || exit 77
-
-# `distcheck' requires GNU make.
-$needs_gnu_make
-
 $ACLOCAL || exit 1
 
 $AUTOCONF || exit 1

diff --git a/tests/subdir5.test b/tests/subdir5.test
index 054416a0ea738e887873f1702e7e038c8d67b5a9..48c9e310ab927ef921c5df806202ff194cdaf7ef 100755 (executable)
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -3,11 +3,10 @@
 # Test to make sure that adding a new directory works.
 # PR automake/46
 
-. $srcdir/defs || exit 1
-
 # This test assumes that the `make' utility is able to start
 # over and reload Makefiles which have been remade (a non-POSIX feature).
-$needs_gnu_make
+required=GNUmake
+. $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
 AC_INIT(a.c)

diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index f2e525663545293b31719ad943bc5e613bd8ed2c..14b1d6ce30c21fc00f6e1966af909b251cdd5b29 100755 (executable)
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -3,6 +3,7 @@
 # Test to make sure target specific CFLAGS work
 # Assar Westerlund <assar@sics.se>
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
@@ -40,8 +41,6 @@ END
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
-$needs_gnu_make
-
 set -e
 
 $ACLOCAL

diff --git a/tests/yacc7.test b/tests/yacc7.test
index 750692dfbeb9d1347f75dbb8494d933de6b63ec2..db4dd691ecbeaa2e8931777c75e96d9f8b480d30 100755 (executable)
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -6,10 +6,9 @@
 # Also check that the sources of the generated parser are distributed.
 # PR/47.
 
+required=GNUmake
 . $srcdir/defs || exit 1
 
-$needs_gnu_make
-
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_YACC

diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 04727993ee75ab3d27d1fe0c25b64d6544a786f4..923cc07845ed375bd160147d0db0d0fcdc550214 100755 (executable)
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -6,10 +6,10 @@
 # `make' and `make distdir' and check whether the version of `parse.c'
 # to be distributed is up to date.
 
+# Require GNU make for `make distdir'
+required=GNUmake
 . $srcdir/defs || exit 1
 
-$needs_gnu_make                        # for `make distdir'
-
 # Likewise for some other tools.
 (gcc -v) > /dev/null 2>&1 || exit 77
 (bison -V) > /dev/null 2>&1 || exit 77