diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-10-12 20:29:58 +0200 |
---|---|---|
committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-10-12 20:29:58 +0200 |
commit | c6b151d0e24f9670695ec6f3ef13f838ef9d05fc (patch) | |
tree | 13f686d61bb6d254ce4740ef862ccbe8466b8c2f | |
parent | 2b0d95faef68d7ed7c08b0edb9ff1c38728376fa (diff) | |
download | autoconf-c6b151d0e24f9670695ec6f3ef13f838ef9d05fc.tar.gz |
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>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | tests/base.at | 5 |
2 files changed, 11 insertions, 2 deletions
@@ -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 cf120997..0973fc4b 100644 --- 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 |