From: Ralf Wildenhues Date: Tue, 24 Oct 2006 20:25:36 +0000 (+0000) Subject: * tests/tagtrace.test: SKIP if `autoconf --trace' exits 63 or 1, X-Git-Tag: release-2-1b~234 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33755ffbf58e1607bd7b3e99ab2647ad14144a19;p=thirdparty%2Flibtool.git * tests/tagtrace.test: SKIP if `autoconf --trace' exits 63 or 1, for various possible (valid) error cases. Also output stderr, to help with analysis. --- diff --git a/ChangeLog b/ChangeLog index 3427fb9e9..9838109d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-10-24 Ralf Wildenhues + * tests/tagtrace.test: SKIP if `autoconf --trace' exits 63 or 1, + for various possible (valid) error cases. Also output stderr, + to help with analysis. + * NEWS: Account for recent multilib fix. * tests/search-path.at: New test, to provide at least a weak test. diff --git a/tests/tagtrace.test b/tests/tagtrace.test index 087c47888..e75a2cf24 100755 --- a/tests/tagtrace.test +++ b/tests/tagtrace.test @@ -32,10 +32,13 @@ else func_skip "This test requires write access to the source tree" fi -if ( cd "$srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) 2>&1 >/dev/null | - grep "Autoconf version .*is required" >/dev/null; then - func_error "This test requires an Autoconf version at least as new" +( cd "$srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null +ret=$? +if test $ret -eq 63 || test $ret -eq 1; then + func_error "This test requires the same Autoconf version" func_skip "as the one that was used to bootstrap Libtool" +elif test $ret -ne 0; then + func_fatal_error "\`$AUTOCONF --trace' exited $ret" fi # Abort as soon as something fails.