From: Ralf Wildenhues Date: Tue, 2 Mar 2010 06:50:19 +0000 (+0100) Subject: Fix `autom4te cache creation' testsuite failure on FreeBSD. X-Git-Tag: v2.66~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5f58b373f349aa9eed8e6d8419cb35981d11735;p=thirdparty%2Fautoconf.git Fix `autom4te cache creation' testsuite failure on FreeBSD. * tests/tools.at (autom4te cache creation): Normalize exit status of failed redirection to 1, may be 2 with FreeBSD sh. * THANKS: Update. Report by Václav Haisman. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 3be2d1cc..9e86d5f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-03-02 Ralf Wildenhues + Fix `autom4te cache creation' testsuite failure on FreeBSD. + * tests/tools.at (autom4te cache creation): Normalize exit + status of failed redirection to 1, may be 2 with FreeBSD sh. + * THANKS: Update. + Report by Václav Haisman. + Fix Autotest tracing of shell pipelines for FreeBSD sh. * lib/autotest/general.m4 (_AT_DECIDE_TRACEABLE): Do not trace commands that contain [^|]|[^|], a likely shell pipeline. diff --git a/THANKS b/THANKS index 16dd8a31..ffa56de3 100644 --- a/THANKS +++ b/THANKS @@ -388,6 +388,7 @@ Tomohiro Suzuki ? Tony Leneis tony@plaza.ds.adp.com Toshio Kuratomi ? Uwe Seimet us@orbacus.com +Václav Haisman v.haisman@sh.cvut.cz Vance Shipley vances@motivity.ca Viktor Dukhovni viktor@anaheim.esm.com Ville Karaila karaila@iki.fi diff --git a/tests/tools.at b/tests/tools.at index d8ac0dc5..f3adb116 100644 --- a/tests/tools.at +++ b/tests/tools.at @@ -1230,7 +1230,8 @@ end-language: "Autoconf-without-aclocal-m4" ]]) # Do not try this when we are root or on systems without permissions. -AT_CHECK([: > sub/some-file && exit 77], 1, [ignore], [ignore]) +# A failed redirection may cause a status of 2 with FreeBSD sh. +AT_CHECK([(: > sub/some-file) || exit 1 && exit 77], 1, [ignore], [ignore]) # Failure to create cache directory. AT_CHECK_AUTOCONF([], [1], [ignore], [stderr])