aboutsummaryrefslogtreecommitdiff
path: root/tests/test
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-06-05 20:06:06 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-06-08 16:50:24 +0300
commit7fdc55efe423f58e5ce03e7f758ace6443800b7a (patch)
treeabca1c7f4f9ebcf1fbc292ff76469f72ded6ee77 /tests/test
parent10a4ed7c470d3fed8e2bb6b2089de68c61f9064b (diff)
Cleanup script command failure diagnostics
Diffstat (limited to 'tests/test')
-rw-r--r--tests/test/script/runner/exit.testscript2
-rw-r--r--tests/test/script/runner/pipe.testscript2
-rw-r--r--tests/test/script/runner/set.testscript2
-rw-r--r--tests/test/script/runner/status.testscript9
4 files changed, 12 insertions, 3 deletions
diff --git a/tests/test/script/runner/exit.testscript b/tests/test/script/runner/exit.testscript
index 200b963..24e51fa 100644
--- a/tests/test/script/runner/exit.testscript
+++ b/tests/test/script/runner/exit.testscript
@@ -54,7 +54,7 @@ empty_id = ''
: exit-code
:
$c <'exit != 0' && $b 2>>EOE != 0
- testscript:1:1: error: exit builtin exit code cannot be non-zero
+ testscript:1:1: error: exit builtin exit code cannot be checked
info: test id: 1
EOE
}
diff --git a/tests/test/script/runner/pipe.testscript b/tests/test/script/runner/pipe.testscript
index 8fecbfc..205fd55 100644
--- a/tests/test/script/runner/pipe.testscript
+++ b/tests/test/script/runner/pipe.testscript
@@ -16,7 +16,7 @@ $c <'$* -o foo | cat >foo' && $b : process-to-builtin
: exit-code
:
$c <'$* -o foo -s 1 | $* -i 1 >foo -s 2' && $b 2>>/~%EOE% != 0
- %testscript:1:1: error: .+ exit code 2 != 0%
+ %testscript:1:1: error: .+ exited with code 2%
info: stdout: test/1/stdout-2
info: test id: 1
EOE
diff --git a/tests/test/script/runner/set.testscript b/tests/test/script/runner/set.testscript
index dcf428d..9219cbb 100644
--- a/tests/test/script/runner/set.testscript
+++ b/tests/test/script/runner/set.testscript
@@ -34,7 +34,7 @@
: status
:
$c <'set foo == 1' && $b 2>>EOE != 0
- testscript:1:1: error: set builtin exit code cannot be non-zero
+ testscript:1:1: error: set builtin exit code cannot be checked
info: test id: 1
EOE
}
diff --git a/tests/test/script/runner/status.testscript b/tests/test/script/runner/status.testscript
index d4759e3..e4586d9 100644
--- a/tests/test/script/runner/status.testscript
+++ b/tests/test/script/runner/status.testscript
@@ -38,6 +38,15 @@ b += --no-column
: error
:
$c <'$* -s 1 -e "Error"' && $b 2>>/~%EOE% != 0
+%testscript:1: error: ../../../driver(.exe)? exited with code 1%
+ info: stderr: test/1/stderr
+Error
+ info: test id: 1
+EOE
+
+: error-check
+:
+$c <'$* -s 1 -e "Error" == 0' && $b 2>>/~%EOE% != 0
%testscript:1: error: ../../../driver(.exe)? exit code 1 != 0%
info: stderr: test/1/stderr
Error