diff options
| author | Peter Stephenson <p.stephenson@samsung.com> | 2018-10-09 11:15:48 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.stephenson@samsung.com> | 2018-10-09 11:15:48 +0100 |
| commit | afee3c9a19264bc30be74afd2338df43c32232ad (patch) | |
| tree | 54789322de32cb1a0717dbd106f8368baf369105 | |
| parent | d768a7492a850e8d1ccb00f2cc8eef0bd238b7ab (diff) | |
| download | zsh-afee3c9a19264bc30be74afd2338df43c32232ad.tar.gz zsh-afee3c9a19264bc30be74afd2338df43c32232ad.tar.xz zsh-afee3c9a19264bc30be74afd2338df43c32232ad.zip | |
unposted: addition to previous trap test suggested by Mikael
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Test/C03traps.ztst | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index cd8a32b85..64c54ca4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2018-10-09 Peter Stephenson <p.stephenson@samsung.com> + * unposted: Test/C03traps.ztst: addition to previous test + suggested by Mikael. + * 43653: Src/builtin.c, Test/C03traps.ztst: explicit exit from EXIT trap overrides previous status. diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst index 3b5d4c610..eab01e5c1 100644 --- a/Test/C03traps.ztst +++ b/Test/C03traps.ztst @@ -866,6 +866,9 @@ F:Must be tested with a top-level script rather than source or function $ZTST_testdir/../Src/zsh -fc 'fn() { exit 13; }; trap fn EXIT; exit' 13:Explicit exit in exit trap overrides status + $ZTST_testdir/../Src/zsh -fc 'fn() { exit $?+8; }; trap fn EXIT; exit 7' +15:Progated exit status through exit trap + %clean rm -f TRAPEXIT |