diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-10 00:58:13 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-10 00:58:13 +0100 |
| commit | 8d3466c80bf79be7770e41fabfb886b0eadd2acb (patch) | |
| tree | bda36bf9e2fade4719e7407446d5e2fddaa0cea5 /tests/defs | |
| parent | 75a11fae8cd4833e121ca0df69ea12796a8a1436 (diff) | |
| parent | 47587d15b0749575e95a49443c6b0e17e0722678 (diff) | |
| download | automake-8d3466c80bf79be7770e41fabfb886b0eadd2acb.tar.gz | |
Merge branch 'master' into testsuite-work
Diffstat (limited to 'tests/defs')
| -rw-r--r-- | tests/defs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/defs b/tests/defs index 28aadebc7..cf15eab3d 100644 --- a/tests/defs +++ b/tests/defs @@ -135,11 +135,13 @@ echo "PATH = $PATH" # variable is unset. set +e -# 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 |