diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Test/C03traps.ztst | 30 |
2 files changed, 35 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 1d1d8f9f5..e3e276e00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-10-06 Peter Stephenson <p.stephenson@samsung.com> + + * 39578: Test/C03traps.ztst: Test some more ERR_RETURN cases + involving "&&" and functions. + 2016-10-05 Peter Stephenson <p.stephenson@samsung.com> * 39571: Src/exec.c, Test/C03traps.ztst: "&&" inside a shell diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst index 5057dcf6e..74b83f33a 100644 --- a/Test/C03traps.ztst +++ b/Test/C03traps.ztst @@ -596,6 +596,36 @@ F:Must be tested with a top-level script rather than source or function >before-out >before-in + (setopt err_return + fn() { + print before-in + false && false + print after-in + } + print before-out + fn + print after-out + ) +0:ERR_RETURN not triggered on LHS of "&&" in function +>before-out +>before-in +>after-in +>after-out + + (setopt err_return + fn() { + print before-in + true && false + print after-in + } + print before-out + fn + print after-out + ) +1:ERR_RETURN triggered on RHS of "&&" in function +>before-out +>before-in + %clean rm -f TRAPEXIT |