From 8865593973b62744ed71e3c57a24280de27c9dad Mon Sep 17 00:00:00 2001
From: Raja R Harinath <harinath@acm.org>
Date: Wed, 8 Aug 2001 21:43:59 +0000
Subject: [PATCH] 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.

---
 ChangeLog           | 9 +++++++++
 tests/cond16.test   | 3 +--
 tests/defs          | 8 ++++++++
 tests/substref.test | 4 +---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51bef8e62..d192e687b 100644
--- 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 407185d9c..47901b322 100755
--- 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 76ff87055..28219ab22 100644
--- 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 ada05b31a..88c03fc9c 100755
--- 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"
-- 
2.47.2