From: Ralf Wildenhues Date: Sun, 11 Oct 2009 11:23:11 +0000 (+0200) Subject: Fix in-tree `recheck' after failed test that runs `check'. X-Git-Tag: v1.12.0b~635 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df239f7be48dc0da255ba044fc1545510eeccb12;p=platform%2Fupstream%2Fautomake.git 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 --- diff --git a/ChangeLog b/ChangeLog index cd3746c..f4311b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-10-11 Ralf Wildenhues + + 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 Updated code enabling Bourne-compatibility in test scripts. diff --git a/tests/defs.in b/tests/defs.in index 995e649..ecdf069 100644 --- 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