tests respect MAKE

diff --git a/tests/ChangeLog b/tests/ChangeLog
index f0da39b0df8f0a21ad05f2ba63562feca2b804dd..1fe6608a27fbd8e616808041407743dea3bdf0bc 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr  8 19:26:07 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * ansi.test, empty.test, exsource.test, insh2.test, man.test,
+       mkinst2.test, texinfo.test, texinfo2.test: Use $MAKE.
+
+       * defs (MAKE): Define.
+
 Mon Apr  7 17:35:49 1997  Tom Tromey  <tromey@cygnus.com>
 
        * version2.test: New file.

diff --git a/tests/ansi.test b/tests/ansi.test
index 7259418b546df0cf1160df3cd8daf3db7729b702..45c1930c70c8e0b973777c1cc0eb8b213065ffc5 100755 (executable)
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -20,4 +20,4 @@ END
 
 $AUTOMAKE || exit 1
 
-make -s -f Makefile.in magic | grep 'ansi2knr\.c'
+$MAKE -s -f Makefile.in magic | grep 'ansi2knr\.c'

diff --git a/tests/defs b/tests/defs
index 8062c5e6c8411aa220b11413e790bfa4852a788c..f208153d93f9d6f773b9cb517bcfb730c6062171 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -45,6 +45,9 @@ test -z "$VERBOSE" && {
 # 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
+
 echo "=== Running test $0"
 
 # See how Automake should be run.  We put --foreign as the default

diff --git a/tests/empty.test b/tests/empty.test
index 94954ad09fe710bd3a0780ef0b802efc3d16e802..09ffeb75bb01c8fbc91e39f0f389ca6e3619fa03 100755 (executable)
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -27,4 +27,4 @@ chmod +x mkinstalldirs
 sed -e 's/@srcdir@/./g' -e 's/@top_srcdir@/./g' -e 's/@datadir@/./g' \
    < Makefile.in > Makefile
 
-make install
+$MAKE install

diff --git a/tests/exsource.test b/tests/exsource.test
index e01e3bf976edea4299c6bc51c690c522c326e631..b4ac66548644adebaa1951c25eb5db9c0fb5fa7b 100755 (executable)
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -6,7 +6,7 @@
 . $srcdir/defs || exit 1
 
 # This test relies on GNU make.
-make --version > /dev/null 2>&1 || {
+$MAKE --version > /dev/null 2>&1 || {
    # Nope.
    exit 0
 }
@@ -34,4 +34,4 @@ echo > .deps/.P
 echo > .deps/xtra.P
 echo > .deps/www.P
 
-make -s -f Makefile.in srcdir=`pwd` magic | grep xtra
+$MAKE -s -f Makefile.in srcdir=`pwd` magic | grep xtra

diff --git a/tests/insh2.test b/tests/insh2.test
index 217411d89584e4a63b49ea01bc310cda70b11e9a..b5018da380a236e3217131431c5379c248293486 100755 (executable)
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -12,4 +12,4 @@ END
 
 $AUTOMAKE || exit 1
 
-make -s -f Makefile.in magic | grep install-sh
+$MAKE -s -f Makefile.in magic | grep install-sh

diff --git a/tests/man.test b/tests/man.test
index 54a35af8c7eaf5d042d71e10f11db1094cf5cd63..2dd465386d461a98fb90014bce260dc49df6620c 100755 (executable)
--- a/tests/man.test
+++ b/tests/man.test
@@ -21,7 +21,7 @@ chmod +x install
 
 mkdir man1 man3 man5
 
-make -f Makefile.in mkinstalldirs=: INSTALL_DATA=cp mandir=`pwd` \
+$MAKE -f Makefile.in mkinstalldirs=: INSTALL_DATA=cp mandir=`pwd` \
    srcdir=`pwd` transform='' install-man \
    || exit 1
 

diff --git a/tests/mkinst2.test b/tests/mkinst2.test
index bda84a272de496cff1885998d2c0b84a0eb20731..b30e46dfc3fcf1e692ca1d662d501cd7ec7d9f09 100755 (executable)
--- a/tests/mkinst2.test
+++ b/tests/mkinst2.test
@@ -19,5 +19,5 @@ chmod +x mkinstalldirs
 
 $AUTOMAKE || exit 1
 
-(make -s -f Makefile.in installdirs | grep man) && exit 1
+($MAKE -s -f Makefile.in installdirs | grep man) && exit 1
 exit 0

diff --git a/tests/texinfo.test b/tests/texinfo.test
index 6097265097e767498ad5095c5572ad1336017f64..96022ff272ec13b2e90fbfb7707bf3e8d0eba0c1 100755 (executable)
--- a/tests/texinfo.test
+++ b/tests/texinfo.test
@@ -16,4 +16,4 @@ echo '@setfilename textutils.info' > textutils.texi
 
 $AUTOMAKE || exit 1
 
-make -s -f Makefile.in magic | grep 'texinfo\.tex'
+$MAKE -s -f Makefile.in magic | grep 'texinfo\.tex'

diff --git a/tests/texinfo2.test b/tests/texinfo2.test
index 74e32818c160b2a1aba6562844ea62d79ddfbd00..a7d9a3cd070530a5cdc6bf63d79ca2cefcfd0066 100755 (executable)
--- a/tests/texinfo2.test
+++ b/tests/texinfo2.test
@@ -17,4 +17,4 @@ echo '@setfilename textutils.info' > textutils.texi
 
 $AUTOMAKE || exit 1
 
-test -z "`make -s -f Makefile.in magic | grep '~'`"
+test -z "`$MAKE -s -f Makefile.in magic | grep '~'`"