Avoid leaking make flags into testsuite results.

* tests/defs.m4sh: Unset MFLAGS, MAKEFLAGS, MAKELEVEL, __MKLVL__
and MAKE_JOBS_FIFO.
* tests/testsuite.at: Likewise.
Fixes warnings in test logs when the user uses 'make -jN check'
and inner $MAKE invocations can't connect to the job server.
Fixes spurious failures of configure-iface.at and of
demo-noinst-link tests with BSD and Tru64 make if the user uses
'make -k', as the exit status of the latter is not reliable.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 9d4bca429589134bfe1b66c3650368da41ace149..230981ecbd093533c0ebf536bdc3a387b5eee889 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Avoid leaking make flags into testsuite results.
+       * tests/defs.m4sh: Unset MFLAGS, MAKEFLAGS, MAKELEVEL, __MKLVL__
+       and MAKE_JOBS_FIFO.
+       * tests/testsuite.at: Likewise.
+       Fixes warnings in test logs when the user uses 'make -jN check'
+       and inner $MAKE invocations can't connect to the job server.
+       Fixes spurious failures of configure-iface.at and of
+       demo-noinst-link tests with BSD and Tru64 make if the user uses
+       'make -k', as the exit status of the latter is not reliable.
+
 2010-09-01  Gary V. Vaughan  <gary@gnu.org>
 
        Remove announce-gen.m4sh and mailnotify.m4sh.

diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 0d23deae1ca26753ddf805e71276d6c9861eac05..b56426ff259b194e66575d84a5195601c8c0bc50 100644 (file)
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -346,6 +346,11 @@ m4dir=$srcdir/libltdl/m4
 auxdir=$srcdir/libltdl/config
 scripts="$auxdir/ltmain.m4sh $srcdir/libtoolize.m4sh"
 
+# 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.
+unset MFLAGS MAKEFLAGS MAKELEVEL __MKLVL__ MAKE_JOBS_FIFO
+
 # On AIX, shared libraries remain loaded in memory after use if they
 # are world-readable, until root issues slibclean.  On NFS, this causes
 # a testsuite rerun to fail to clean up test group directories.  Avoid

diff --git a/tests/testsuite.at b/tests/testsuite.at
index a20e0749b6cac7418a8ed963d2b14ca33e7b8591..c646c5df16c22aab4a3b1f80bc8136c478ea9319 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -61,6 +61,11 @@ case $lt_INSTALL in
     ;;
 esac
 
+# 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.
+unset MFLAGS MAKEFLAGS MAKELEVEL __MKLVL__ MAKE_JOBS_FIFO
+
 # On AIX, shared libraries remain loaded in memory after use if they
 # are world-readable, until root issues slibclean.  On NFS, this causes
 # a testsuite rerun to fail to clean up test group directories.  Avoid