From: Stefano Lattarini Date: Tue, 8 Nov 2011 18:50:29 +0000 (+0100) Subject: tests: testsuite is now safe to run with dmake in parallel mode X-Git-Tag: v1.11.1b~12^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c615147195e1248a5e896a38623fa085861460d2;p=thirdparty%2Fautomake.git tests: testsuite is now safe to run with dmake in parallel mode * tests/defs.in: Unset variables DMAKE_CHILD, DMAKE_DEF_PRINTED and DMAKE_MAX_JOBS, which are exported by Solaris dmake when run in parallel mode, and which might confuse make processes spawned by our testsuite. --- diff --git a/ChangeLog b/ChangeLog index 3cd5deafc..8769d8334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-11-08 Stefano Lattarini + + tests: testsuite is now safe to run with dmake in parallel mode + * tests/defs.in: Unset variables DMAKE_CHILD, DMAKE_DEF_PRINTED + and DMAKE_MAX_JOBS, which are exported by Solaris dmake when run + in parallel mode, and which might confuse make processes spawned + by our testsuite. + 2011-11-08 Stefano Lattarini tests: fix spurious failures w.r.t. parallel make and colorization diff --git a/tests/defs.in b/tests/defs.in index f99909206..f24d2ad4c 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -410,11 +410,13 @@ cd ./$testSubDir echo "AC_CONFIG_FILES([Makefile])" } >configure.in -# Unset some MAKE... variables that may cause $MAKE to act like a -# recursively invoked sub-make. Any $MAKE invocation in a test is +# Unset some make-related 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 MAKEFLAGS AM_MAKEFLAGS MAKELEVEL __MKLVL__ MAKE_JOBS_FIFO +unset MFLAGS MAKEFLAGS AM_MAKEFLAGS MAKELEVEL +unset __MKLVL__ MAKE_JOBS_FIFO # For BSD make. +unset DMAKE_CHILD DMAKE_DEF_PRINTED DMAKE_MAX_JOBS # For Solaris dmake. # Unset verbosity flag. unset V # Also unset variables that will let `make -e install' divert