Fix in-tree `recheck' after failed test that runs `check'.

If a test like pr401b-p.test fails for some reason, a `make
recheck' would cause another reason for failure because it sets
AM_MAKEFLAGS which gets propagated into the test and causes its
`make check' to fail.

* tests/defs.in: Also unset AM_MAKEFLAGS.

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

diff --git a/ChangeLog b/ChangeLog
index cd3746c..f4311b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix in-tree `recheck' after failed test that runs `check'.
+       If a test like pr401b-p.test fails for some reason, a `make
+       recheck' would cause another reason for failure because it sets
+       AM_MAKEFLAGS which gets propagated into the test and causes its
+       `make check' to fail.
+       * tests/defs.in: Also unset AM_MAKEFLAGS.
+
 2009-10-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Updated code enabling Bourne-compatibility in test scripts.

diff --git a/tests/defs.in b/tests/defs.in
index 995e649..ecdf069 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -297,9 +297,7 @@ END
 # 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
+unset MFLAGS MAKEFLAGS MAKELEVEL AM_MAKEFLAGS
 # Unset verbosity flag.
 unset V
 # Also unset variables that will let `make -e install' divert