From: Ralf Wildenhues Date: Thu, 27 Nov 2008 19:02:34 +0000 (+0100) Subject: Fix a couple of test failures with dash. X-Git-Tag: v2.63b~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ee23e298de28b1a7eb64aeb1ba7322dd370ed2;p=thirdparty%2Fautoconf.git Fix a couple of test failures with dash. * tests/autotest.at (AT_CHECK_AT_TITLE_CHAR): Normalize exit status of `cd'. * tests/m4sh.at (AS_MESSAGE_LOG_FD): Remove script before regeneration, to avoid timing effects. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 34dc21d2c..60471e19d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-27 Ralf Wildenhues + + Fix a couple of test failures with dash. + * tests/autotest.at (AT_CHECK_AT_TITLE_CHAR): Normalize + exit status of `cd'. + * tests/m4sh.at (AS_MESSAGE_LOG_FD): Remove script before + regeneration, to avoid timing effects. + 2008-11-25 Eric Blake Add m4_cleardivert. diff --git a/tests/autotest.at b/tests/autotest.at index 6eb4d1961..576eb80e0 100644 --- a/tests/autotest.at +++ b/tests/autotest.at @@ -616,9 +616,9 @@ AT_CHECK([$CONFIG_SHELL ./micro-suite --clean --directory="`pwd`/sub2"]) AT_CHECK([test -f sub2/micro-suite.log], [1]) AT_CHECK([test -f sub2/micro-suite.dir], [1]) dnl check for failure detection with bad, missing, or empty directory. -AT_CHECK([$CONFIG_SHELL ./micro-suite -C nonesuch], [1], [ignore], [ignore]) +AT_CHECK([$CONFIG_SHELL ./micro-suite -C nonesuch || exit 1], [1], [ignore], [ignore]) AT_CHECK([$CONFIG_SHELL ./micro-suite -C ''], [1], [ignore], [ignore]) -AT_CHECK([$CONFIG_SHELL ./micro-suite -C -], [1], [ignore], [ignore]) +AT_CHECK([$CONFIG_SHELL ./micro-suite -C - || exit 1], [1], [ignore], [ignore]) AT_CHECK([$CONFIG_SHELL ./micro-suite -C], [1], [ignore], [ignore]) dnl check that --help overrides bad directory selection. AT_CHECK([$CONFIG_SHELL ./micro-suite -C nonesuch --help], [0], [ignore], []) diff --git a/tests/m4sh.at b/tests/m4sh.at index 0c575deda..daedc0e46 100644 --- a/tests/m4sh.at +++ b/tests/m4sh.at @@ -1308,6 +1308,7 @@ exec AS_MESSAGE_LOG_FD>- ./$child ]]) +rm -f script AT_CHECK_M4SH AT_CHECK([./script], [0], [[script: hello from parent hello1 from child