* tests/defs.in: Run $MAKE --version -v.

* tests/dollar.test: Abort on ./defs failure.
* tests/lex5.test: Require GNUmake, not make.

diff --git a/ChangeLog b/ChangeLog
index 2ce165b0fb0ef60eaeb405fb481cf6be84151624..ff3d4fd7f45de3ab31b1ce9e9efa9925b2b39360 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-30  Ezra Peisach  <epeisach@MED-XTAL.BU.EDU>
+
+       * tests/defs.in: Run $MAKE --version -v.
+       * tests/dollar.test: Abort on ./defs failure.
+       * tests/lex5.test: Require GNUmake, not make.
+
 2002-09-30  Kevin Ryde  <user42@zip.com.au>
 
        * m4/as.m4 (AM_PROG_AS): Let CCAS and CCASFLAGS default to the actual

diff --git a/THANKS b/THANKS
index e9e0cad05a4f90c8186ce56d744804dd534c8a7c..dbf94d886271727497a16670e5431fbbbed6fc0d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -55,6 +55,7 @@ Eric Magnien          emagnien@club-internet.fr
 Eric Siegerman         erics_97@pobox.com
 Erick Branderhorst     branderh@iaehv.nl
 Erik Lindahl           E.Lindahl@chem.rug.nl
+Ezra Peisach           epeisach@MED-XTAL.BU.EDU
 Flavien Astraud                flav42@yahoo.fr
 François Pinard                pinard@iro.umontreal.ca
 Fred Fish              fnf@ninemoons.com

diff --git a/tests/defs.in b/tests/defs.in
index 6a8d5fca8a9b82d6f449a5e168015c74f724c086..1edc066e18489e8903eb4a35098c3dc465821ccd 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -72,8 +72,9 @@ then
        ( bison --version ) || exit 77
        ;;
       GNUmake)
-       echo "$me: running $MAKE --version"
-       ( $MAKE --version ) || exit 77
+       # Use --version and -v, because SGI Make doesn't fail on --version.
+       echo "$me: running $MAKE --version -v"
+       ( $MAKE --version -v ) || exit 77
        ;;
       gcc)
         # When gcc is required, export `CC=gcc' so that ./configure

diff --git a/tests/dollar.test b/tests/dollar.test
index 390def156fbda623371f7790245aabb7eb4c3533..42bed03fbfa443870d374aad87c5eb882af3c571 100755 (executable)
--- a/tests/dollar.test
+++ b/tests/dollar.test
@@ -25,7 +25,7 @@
 # Require GNU make for this test.  SunOS Make does not support
 # `$$' in a target or a dependency (it outputs the empty string instead).
 required=GNUmake
-. ./defs
+. ./defs || exit 1
 
 set -e
 

diff --git a/tests/lex5.test b/tests/lex5.test
index 7f59e45e45b6974b7d03c0f8d91f8ac017437ba2..def42b35f23e6bbc3c6a553d54648b1ec3860a1c 100755 (executable)
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -20,7 +20,7 @@
 
 # Test for subdir lexers.
 
-required='gcc make gzip'
+required='gcc GNUmake gzip'
 . ./defs || exit 1
 
 set -e