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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 34dc21d2cc92d2d4b7141b81e6df5c6d26fd7433..60471e19df4ab9c47ac8affe7952a38a5396a6bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <ebb9@byu.net>
 
        Add m4_cleardivert.

diff --git a/tests/autotest.at b/tests/autotest.at
index 6eb4d196138a719ab7123aa9f80c969f32089eac..576eb80e0551081812b5d98fe34a2516ec2556b1 100644 (file)
--- 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 0c575dedaad9c6d0befa208073d55be8a6747425..daedc0e4634c6f74a4365fd2d48918c8c90027c4 100644 (file)
--- 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