From 26ec82730d6254c9a7aad79dc888bec91e2c72e2 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 21 Dec 2019 08:30:05 +0000 Subject: unposted: Group related tests. No functional change. --- ChangeLog | 3 +++ Test/A01grammar.ztst | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8b864807..15b4cad52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2019-12-21 Daniel Shahaf + * unposted: Test/A01grammar.ztst: Group related tests. + No functional change. + * unposted: Etc/BUGS: Add two bugs discussed on -workers@ this week diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst index c8600d4cb..2649c29c8 100644 --- a/Test/A01grammar.ztst +++ b/Test/A01grammar.ztst @@ -466,14 +466,6 @@ >Status after always block is 1. ?(eval):3: bad substitution - fn() { { return } always { echo always 1 }; echo not executed } - fn - fn() { { echo try 2 } always { return }; echo not executed } - fn -0:Always block interaction with return ->always 1 ->try 2 - # Outputting of structures from the wordcode is distinctly non-trivial, # we probably ought to have more like the following... fn1() { { echo foo; } } @@ -720,6 +712,14 @@ >read it >read it + fn() { { return } always { echo always 1 }; echo not executed } + fn + fn() { { echo try 2 } always { return }; echo not executed } + fn +0:Always block interaction with return +>always 1 +>try 2 + ( mywrap() { echo BEGIN; true; echo END } mytest() { { exit 3 } always { mywrap }; print Exited before this } -- cgit 1.4.1