tests: avoid AC_CACHE_CHECK test failure with dash.

* tests/base.at (AC_CACHE_CHECK): Normalize configure exit
status in presence of syntax error in sourced site file.
Do not error out if configure is aborted at this point.
Fixes testsuite failure with dash 0.5.5.1.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 609846afd4f2fc4807fdef38d8be1b1196baad05..9217438ca914de11bfb87e668f2f657557d092cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       tests: avoid AC_CACHE_CHECK test failure with dash.
+       * tests/base.at (AC_CACHE_CHECK): Normalize configure exit
+       status in presence of syntax error in sourced site file.
+       Do not error out if configure is aborted at this point.
+       Fixes testsuite failure with dash 0.5.5.1.
+
 2010-10-08  Eric Blake  <eblake@redhat.com>
 
        AS_LITERAL_IF: Treat raw = as literal again.

diff --git a/tests/base.at b/tests/base.at
index cf120997afb9d438d7be3642f9e6ddcfb6804ec8..0973fc4bd26b6098695be7711a3ee576154b321d 100644 (file)
--- a/tests/base.at
+++ b/tests/base.at
@@ -493,8 +493,9 @@ AT_DATA([bad.site],
 [[fi
 ]])
 CONFIG_SITE=$PWD/bad.site
-AT_CHECK_CONFIGURE([], [1], [ignore], [stderr])
-AT_CHECK([grep 'failed to load site script' stderr], [], [ignore])
+AT_CHECK_CONFIGURE([ || exit 1], [1], [stdout], [stderr])
+AT_CHECK([grep 'failed to load site script' stderr], [], [ignore], [ignore],
+        [AT_CHECK([grep 'whether true' stdout], [1])])
 
 # However, a missing file is ignored.
 CONFIG_SITE=./no-such-file