From 4abf2246375e96b8a82affdf04f079e3e9ee7c73 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 10 Dec 2010 07:39:04 +0100 Subject: [PATCH] Avoid running installed automake from 'libtool --help'. * tests/subobj9.test: Export AUTOCONF and AUTOMAKE. Together with fixed Libtool, this fixes check-coverage to not invoke installed automake. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ tests/subobj9.test | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index e8864f125..5afdc53e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-12-10 Ralf Wildenhues + + Avoid running installed automake from 'libtool --help'. + * tests/subobj9.test: Export AUTOCONF and AUTOMAKE. + Together with fixed Libtool, this fixes check-coverage to not + invoke installed automake. + 2010-11-25 Stefano Lattarini Fix spurious failures in `silent*.test' for $CC != gcc diff --git a/tests/subobj9.test b/tests/subobj9.test index 2045d58e9..83f3a31ef 100755 --- a/tests/subobj9.test +++ b/tests/subobj9.test @@ -64,6 +64,9 @@ $AUTOMAKE -a # Skip this test on configure errors (e.g., broken C++ compilers). ./configure || Exit 77 +# Ensure './libtool --help' will use the right tool versions. +export AUTOCONF AUTOMAKE + # Opportunistically check that --tag=CXX is used when supported. if ./libtool --help | grep tag=TAG; then $MAKE print >stdout || { cat stdout; Exit 1; } -- 2.47.2