summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-11-27 20:02:34 +0100
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-11-27 20:02:34 +0100
commit36ee23e298de28b1a7eb64aeb1ba7322dd370ed2 (patch)
treeb1617368ab62802288381a675b4956061f520fdc /tests
parent580ada8c2e37468e1a896003bdd15b39f6dd4452 (diff)
downloadautoconf-36ee23e298de28b1a7eb64aeb1ba7322dd370ed2.tar.gz
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/autotest.at4
-rw-r--r--tests/m4sh.at1
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/autotest.at b/tests/autotest.at
index 6eb4d196..576eb80e 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 0c575ded..daedc0e4 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