>From c7e2a7efa29a26717e668b40b1f4a95602fe73ff Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 28 Feb 2010 06:36:08 +0100 Subject: [PATCH 2/4] Fix `autom4te cache creation' testsuite failure on FreeBSD. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tests/tools.at (autom4te cache creation): Normalize exit status of failed redirection to 1, may be 2 with FreeBSD sh. Report by Václav Haisman. Signed-off-by: Ralf Wildenhues --- ChangeLog | 5 +++++ tests/tools.at | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3ee4a5..bf091b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-02-28 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. + Report by Václav Haisman. + Fix AS_ERROR for FreeBSD sh. * lib/m4sugar/m4sh.m4 (_AS_ERROR_PREPARE): Rewrite as_fn_error to take additional first argument STATUS instead of transporting diff --git a/tests/tools.at b/tests/tools.at index d8ac0dc..f3adb11 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]) -- 1.7.0.rc1.161.g90487