From: Ralf Wildenhues Date: Wed, 1 Sep 2010 19:30:30 +0000 (+0200) Subject: Avoid leaking make flags into testsuite results. X-Git-Tag: v2.4~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7db65ac237512a01365f2fa9fc4f811835e4c690;p=thirdparty%2Flibtool.git 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 --- diff --git a/ChangeLog b/ChangeLog index 9d4bca429..230981ecb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-09-01 Ralf Wildenhues + + 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 Remove announce-gen.m4sh and mailnotify.m4sh. diff --git a/tests/defs.m4sh b/tests/defs.m4sh index 0d23deae1..b56426ff2 100644 --- 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 a20e0749b..c646c5df1 100644 --- 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