Dissociate testsuite 'make' invocations from outer 'make'.

* tests/defs: Unset the MFLAGS, MAKEFLAGS and MAKELEVEL
environment variables.
* tests/cond16.test: Use '$MAKE -s', and avoid GNU make
dependency.
* tests/substref.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 51bef8e6215e488d29a60da5a058460a99b2c2ec..d192e687ba9a7650b22c85c8ce0e2c4bba783132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-08  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Dissociate testsuite 'make' invocations from outer 'make'.
+       * tests/defs: Unset the MFLAGS, MAKEFLAGS and MAKELEVEL
+       environment variables.
+       * tests/cond16.test: Use '$MAKE -s', and avoid GNU make
+       dependency. 
+       * tests/substref.test: Likewise.
+
 2001-08-08  Richard Boulton <richard@tartarus.org>
 
        * tests/cond18.test: New file.

diff --git a/tests/cond16.test b/tests/cond16.test
index 407185d9c4bcb7409bb1950c275911ec12d5be2f..47901b322a28659e817abbf9300bf39e85565cd8 100755 (executable)
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -34,7 +34,6 @@ END
 
 $needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
-$needs_gnu_make
 
 set -e
 
@@ -44,6 +43,6 @@ $AUTOMAKE -a
 
 CC='gcc' ./configure
 
-val=`$MAKE --no-print-directory echorule`;
+val=`$MAKE -s echorule`;
 echo $val
 test "x$val" = "xfoo.c foo.o"

diff --git a/tests/defs b/tests/defs
index 76ff870550c11f4095c6468072f12f64ecc8f8d0..28219ab2283c59f4810578467e1210865a0d982c 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -55,6 +55,14 @@ 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
+# 'automake' build.
+unset MFLAGS
+unset MAKEFLAGS
+unset MAKELEVEL
+
 if ($MAKE --version) > /dev/null 2>&1; then
    needs_gnu_make=:
 else

diff --git a/tests/substref.test b/tests/substref.test
index ada05b31ae0f1ba49e72abdfa6b98dd44cc3f36b..88c03fc9cbf77c6690eadc13e2e689dc3be4ae78 100755 (executable)
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -32,7 +32,6 @@ END
 
 $needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
-$needs_gnu_make
 
 set -e
 
@@ -42,7 +41,6 @@ $AUTOMAKE -a
 
 CC='gcc' ./configure
 
-# Grep away the entering/leaving directory messages.
-val=`$MAKE --no-print-directory echorule`;
+val=`$MAKE -s echorule`;
 echo $val
 test "x$val" = "xdlmain.c dlmain.o"