diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Test/C03traps.ztst | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index cc43bfe29..d34e9c20a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-10 Peter Stephenson <pws@csr.com> + + * c.f. 27950: Test/C03traps.ztst some bogus whitespace got added + in patching 27947. + 2010-05-10 Frank Terbeck <ft@bewatermyfriend.org> * Seth House, Simon Ruderich and myself: 27948: @@ -13117,5 +13122,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4974 $ +* $Revision: 1.4975 $ ***************************************************** diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst index 853ae1aa0..1c4006cc4 100644 --- a/Test/C03traps.ztst +++ b/Test/C03traps.ztst @@ -352,11 +352,11 @@ { trap 'echo This subshell is exiting' EXIT; } | cat 0: EXIT trap set in current shell at left of pipeline ->This subshell is exiting +>This subshell is exiting ( trap 'echo This subshell is also exiting' EXIT; ) | cat 0: EXIT trap set in subshell at left of pipeline ->This subshell is also exiting +>This subshell is also exiting ( trap 'echo Should only appear once at the end' EXIT ( : trap reset here ) | cat @@ -365,11 +365,11 @@ ) 0: EXIT trap set in subshell reset in subsubshell >nothing after this should appear ->Should only appear once at the end +>Should only appear once at the end echo $( trap 'echo command substitution exited' EXIT ) 0: EXIT trap set in command substitution ->command substitution exited +>command substitution exited %clean |