diff options
| -rw-r--r-- | src/Output.hs | 1 | ||||
| -rw-r--r-- | test/script/run.et | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/Output.hs b/src/Output.hs index ca79dab..01c0b4b 100644 --- a/src/Output.hs +++ b/src/Output.hs @@ -193,6 +193,7 @@ testOutputLines otype@(OutputMatchFail (CallStack stack)) _ msg = concat [ [ T.concat [ outTestLabel otype, " ", msg ] ] , concat $ flip map stack $ \( sline, vars ) -> T.concat [ outTestLabel otype, "-line ", textSourceLine sline ] : showVars vars + , [ T.concat [ outTestLabel otype, "-done" ] ] ] where showVars = diff --git a/test/script/run.et b/test/script/run.et index b2d3ca9..7f789ab 100644 --- a/test/script/run.et +++ b/test/script/run.et @@ -117,6 +117,9 @@ test CallStack: expect /match-fail-line .*\/callstack.et:3:5: .*/ expect /match-fail-var x 1/ local: + expect /(match-fail-.*)/ capture done + guard (done == "match-fail-done") + local: expect /(run-.*)/ capture done guard (done == "run-failed") flush @@ -126,6 +129,9 @@ test CallStack: expect /match-fail-line .*\/callstack.et:8:5: .*/ expect /match-fail-var x 2/ local: + expect /(match-fail-.*)/ capture done + guard (done == "match-fail-done") + local: expect /(run-.*)/ capture done guard (done == "run-failed") flush @@ -136,6 +142,9 @@ test CallStack: expect /match-fail-var x 1/ expect /match-fail-line .*\/callstack.et:15:5: .*/ local: + expect /(match-fail-.*)/ capture done + guard (done == "match-fail-done") + local: expect /(run-.*)/ capture done guard (done == "run-failed") flush @@ -148,6 +157,9 @@ test CallStack: expect /match-fail-line .*\/callstack.et:23:5: .*/ expect /match-fail-var z 3/ local: + expect /(match-fail-.*)/ capture done + guard (done == "match-fail-done") + local: expect /(run-.*)/ capture done guard (done == "run-failed") flush @@ -157,6 +169,10 @@ test CallStack: expect /match-fail-line .*\/callstack.et:27:5: .*/ expect /match-fail-var x 1/ expect /match-fail-line .*\/callstack.et:31:5: .*/ + expect /match-fail-var p .*/ + local: + expect /(match-fail-.*)/ capture done + guard (done == "match-fail-done") local: expect /(run-.*)/ capture done guard (done == "run-failed") @@ -168,8 +184,12 @@ test CallStack: expect /match-fail-var x 3/ expect /match-fail-var y 2/ expect /match-fail-line .*\/callstack.et:41:5: .*/ + expect /match-fail-var p .*/ expect /match-fail-var z 3/ local: + expect /(match-fail-.*)/ capture done + guard (done == "match-fail-done") + local: expect /(run-.*)/ capture done guard (done == "run-failed") flush |