* 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. --- ChangeLog | 8 ++++++++ tests/defs.in | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 3cd5dea..8769d83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-11-08 Stefano Lattarini <stefano.lattar...@gmail.com> + 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 <stefano.lattar...@gmail.com> + tests: fix spurious failures w.r.t. parallel make and colorization * tests/color2.test: Skip the test if the $MAKE program fails to consider the standard output as a tty when spawned by `expect'. diff --git a/tests/defs.in b/tests/defs.in index f999092..f24d2ad 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 -- 1.7.2.3