diff options
Diffstat (limited to 'test/script')
| -rw-r--r-- | test/script/definition.et | 2 | ||||
| -rw-r--r-- | test/script/list.et | 5 | ||||
| -rw-r--r-- | test/script/output.et | 10 | ||||
| -rw-r--r-- | test/script/run.et | 129 |
4 files changed, 120 insertions, 26 deletions
diff --git a/test/script/definition.et b/test/script/definition.et index 3d84040..45951cd 100644 --- a/test/script/definition.et +++ b/test/script/definition.et @@ -15,5 +15,7 @@ test Definition: expect /match p 4/ expect /child-stdout p 11/ expect /match p 11/ + expect /run-test-result Test (.*)/ capture result + guard (result == "done") expect /(.*)/ capture done guard (done == "run-done") diff --git a/test/script/list.et b/test/script/list.et index cfd4803..4b493a5 100644 --- a/test/script/list.et +++ b/test/script/list.et @@ -37,5 +37,6 @@ test ListConcat: "c4 3" "c4-end" local: - expect /(run-.*)/ capture done - guard (done == "run-done") + expect /run-test-result Test (.*)/ capture result + guard (result == "done") + expect /run-done/ diff --git a/test/script/output.et b/test/script/output.et index d3f0eea..f210490 100644 --- a/test/script/output.et +++ b/test/script/output.et @@ -22,8 +22,9 @@ test FlushOutput: expect /match p a/ expect /match-fail expect.*/ - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result Test (.*)/ capture result + guard (result == "failed") + expect /run-done/ test IgnoreOutput: spawn as p @@ -51,5 +52,6 @@ test IgnoreOutput: expect /match p F/ expect /match-fail expect.*/ - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result Test (.*)/ capture result + guard (result == "failed") + expect /run-done/ diff --git a/test/script/run.et b/test/script/run.et index 2572f87..97f4dd8 100644 --- a/test/script/run.et +++ b/test/script/run.et @@ -18,14 +18,16 @@ test TrivialRun: send "run AlwaysSucceeds" local: - expect /(run-.*)/ capture done - guard (done == "run-done") + expect /run-test-result AlwaysSucceeds (.*)/ capture result + guard (result == "done") + expect /run-done/ send "run AlwaysFails" local: expect /match-fail .*/ - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result AlwaysFails (.*)/ capture result + guard (result == "failed") + expect /run-done/ test SimpleRun: @@ -43,8 +45,9 @@ test SimpleRun: send "run Test" local: - expect /(run-.*)/ capture done - guard (done == "run-done") + expect /run-test-result Test (.*)/ capture result + guard (result == "done") + expect /run-done/ flush for file in should_fail: @@ -56,8 +59,9 @@ test SimpleRun: send "run Test" local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result Test (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush @@ -120,8 +124,9 @@ test CallStack: expect /(match-fail-.*)/ capture done guard (done == "match-fail-done") local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result AG (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush send "run AE" @@ -132,8 +137,9 @@ test CallStack: expect /(match-fail-.*)/ capture done guard (done == "match-fail-done") local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result AE (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush send "run BG" @@ -145,8 +151,9 @@ test CallStack: expect /(match-fail-.*)/ capture done guard (done == "match-fail-done") local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result BG (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush send "run CG" @@ -160,8 +167,9 @@ test CallStack: expect /(match-fail-.*)/ capture done guard (done == "match-fail-done") local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result CG (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush send "run BE" @@ -174,8 +182,9 @@ test CallStack: expect /(match-fail-.*)/ capture done guard (done == "match-fail-done") local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result BE (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush send "run CE" @@ -190,6 +199,86 @@ test CallStack: expect /(match-fail-.*)/ capture done guard (done == "match-fail-done") local: - expect /(run-.*)/ capture done - guard (done == "run-failed") + expect /run-test-result CE (.*)/ capture result + guard (result == "failed") + expect /run-done/ flush + + +test RunTag: + spawn as p + with p: + send "load ${scripts.path}/tags.et" + local: + expect /(load-.*)/ capture done + guard (done == "load-done") + flush + + send "run A" + local: + expect /run-test-result A1 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result A2 (.*)/ capture result + guard (result == "done") + local: + expect /run-(.*)/ capture done + guard (done == "done") + + send "run B C" + local: + expect /run-test-result B1 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result B2 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result C1 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result C2 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result BC (.*)/ capture result + guard (result == "done") + local: + expect /run-(.*)/ capture done + guard (done == "done") + + +test RunTagExclude: + spawn as p + with p: + send "load ${scripts.path}/tags.et" + local: + expect /(load-.*)/ capture done + guard (done == "load-done") + flush + + send "run * ^A ^C ^T2 ^B1" + local: + expect /run-test-result T1 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result B2 (.*)/ capture result + guard (result == "done") + local: + expect /run-(.*)/ capture done + guard (done == "done") + + send "run T1 B1 A C ^B ^A1" + local: + expect /run-test-result T1 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result A2 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result C1 (.*)/ capture result + guard (result == "done") + local: + expect /run-test-result C2 (.*)/ capture result + guard (result == "done") + local: + expect /run-(.*)/ capture done + guard (done == "done") |