summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Test/C05debug.ztst10
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 28cb6b253..9ade3636f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-04 Peter Stephenson <pws@csr.com>
+
+ * 26006: Test/C05debug.ztst: remove dependence on system
+ error message.
+
2008-11-03 Peter Stephenson <pws@csr.com>
* unposted: Config/version.mk: update version to 4.3.9-dev-0.
diff --git a/Test/C05debug.ztst b/Test/C05debug.ztst
index b5515c90c..5cbf18a45 100644
--- a/Test/C05debug.ztst
+++ b/Test/C05debug.ztst
@@ -52,9 +52,15 @@
# Failure
exit 10
HERE
- $ZTST_testdir/../Src/zsh -f ./zsh-trapreturn-bug2
+ $ZTST_testdir/../Src/zsh -f ./zsh-trapreturn-bug2 2>erroutput.dif
+ mystat=$?
+ (
+ setopt extendedglob
+ print ${"$(< erroutput.dif)"%%:[^:]#: ./fdasfsdafd}
+ )
+ (( mystat == 0 ))
0: trapreturn handling bug is properly fixed
-?./zsh-trapreturn-bug2:5: no such file or directory: ./fdasfsdafd
+>./zsh-trapreturn-bug2:5
fn() {
setopt localtraps localoptions debugbeforecmd