aboutsummaryrefslogtreecommitdiff
path: root/tests/test/script/runner/status.test
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-01-30 23:31:45 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-01-31 15:54:40 +0300
commit7cf026b8989a71a0d0e775e21e697ba9f1bee987 (patch)
tree9d7b78c91d1dae66bf2faabba7aa9acc11a17f6d /tests/test/script/runner/status.test
parent749f748ae6ded6e229214d2dddf3c45482bffbd3 (diff)
Move builtin and runner tests to '$c ... && $b' pattern
Diffstat (limited to 'tests/test/script/runner/status.test')
-rw-r--r--tests/test/script/runner/status.test18
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.test
index c1df3e4..67ce3ae 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.test
@@ -11,13 +11,11 @@ b += --no-column
{
: true
:
- $c <'$* == 0';
- $b
+ $c <'$* == 0' && $b
: false
:
- $c <'$* -s 1 == 0';
- $b 2>>/~%EOE%d != 0
+ $c <'$* -s 1 == 0' && $b 2>>/~%EOE%d != 0
%testscript:1: error: ../../../../driver(.exe)? exit status 1 != 0%
EOE
}
@@ -27,21 +25,18 @@ b += --no-column
{
: true
:
- $c <'$* -s 1 != 0';
- $b
+ $c <'$* -s 1 != 0' && $b
: false
:
- $c <'$* -s 1 != 1';
- $b 2>>/~%EOE% != 0
+ $c <'$* -s 1 != 1' && $b 2>>/~%EOE% != 0
%testscript:1: error: ../../../../driver(.exe)? exit status 1 == 1%
EOE
}
: error
:
-$c <'$* -s 1 -e "Error"';
-$b 2>>/~%EOE% != 0
+$c <'$* -s 1 -e "Error"' && $b 2>>/~%EOE% != 0
%testscript:1: error: ../../../driver(.exe)? exit status 1 != 0%
info: stderr: test/1/stderr
Error
@@ -53,8 +48,7 @@ EOE
: Can pop up dialog boxes on Windows or produce coredump on POSIX. Note that
: under Wine some extra info is printed to STDOUT.
:
-$c <'$* -t m';
-$b 2>>/~%EOE% != 0
+$c <'$* -t m' && $b 2>>/~%EOE% != 0
%wine: .+%?
%testscript:1: error: ../../../driver(.exe)? terminated abnormally%d
% info: .+%