Re: automake 1.7 (CVS) test failure when make =! GNU make

[Alexandre Duret-Lutz]

Thanks!  I'm installing the following on HEAD and branch-1-7.

2002-09-30  Ezra Peisach  <address@hidden>

        * tests/defs.in: Run $MAKE --version -v.
        * tests/dollar.test: Abort on ./defs failure.
        * tests/lex5.test: Require GNUmake, not make.

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.186.2.1
diff -u -r1.186.2.1 THANKS
--- THANKS      30 Sep 2002 20:10:11 -0000      1.186.2.1
+++ THANKS      30 Sep 2002 20:10:53 -0000
@@ -55,6 +55,7 @@
 Eric Siegerman         address@hidden
 Erick Branderhorst     address@hidden
 Erik Lindahl           address@hidden
+Ezra Peisach           address@hidden
 Flavien Astraud                address@hidden
 François Pinard                address@hidden
 Fred Fish              address@hidden
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.4
diff -u -r1.4 defs.in
--- tests/defs.in       25 Sep 2002 18:46:47 -0000      1.4
+++ tests/defs.in       30 Sep 2002 20:11:02 -0000
@@ -72,8 +72,9 @@
        ( 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
Index: tests/dollar.test
===================================================================
RCS file: /cvs/automake/automake/tests/dollar.test,v
retrieving revision 1.5
diff -u -r1.5 dollar.test
--- tests/dollar.test   8 Sep 2002 13:07:55 -0000       1.5
+++ tests/dollar.test   30 Sep 2002 20:11:02 -0000
@@ -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
 
Index: tests/lex5.test
===================================================================
RCS file: /cvs/automake/automake/tests/lex5.test,v
retrieving revision 1.3
diff -u -r1.3 lex5.test
--- tests/lex5.test     8 Sep 2002 13:07:55 -0000       1.3
+++ tests/lex5.test     30 Sep 2002 20:11:02 -0000
@@ -20,7 +20,7 @@
 
 # Test for subdir lexers.
 
-required='gcc make gzip'
+required='gcc GNUmake gzip'
 . ./defs || exit 1
 
 set -e
-- 
Alexandre Duret-Lutz