summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Test/C03traps.ztst6
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 12cf3ebf2..ddcf717cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-10-10  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* unposted: Test/C03traps.ztst: Another couple of tests for
+	other code paths.
+
 	* 43669: Src/builtin.c, Src/init.c, Test/C03traps.ztst: ensure
 	explicit exit status is used rather than implicit.
 
diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst
index 57daf8ddf..4aebd92b7 100644
--- a/Test/C03traps.ztst
+++ b/Test/C03traps.ztst
@@ -875,6 +875,12 @@ F:Must be tested with a top-level script rather than source or function
   $ZTST_testdir/../Src/zsh -fc 'fn() { exit 0; }; trap fn EXIT; false'
 0:Explicit exit status 0 in exit trap overrides implicit non-zero status
 
+  $ZTST_testdir/../Src/zsh -f <<<'fn() { exit 13; }; trap fn EXIT; false'
+13:Exit status from exit trap, script-like path
+
+  $ZTST_testdir/../Src/zsh -f <<<'fn() { exit 0; }; trap fn EXIT; false'
+0:Explicit exit status overrides implicit: script-like code path
+
 %clean
 
   rm -f TRAPEXIT