From 7cf026b8989a71a0d0e775e21e697ba9f1bee987 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 30 Jan 2017 23:31:45 +0300
Subject: Move builtin and runner tests to '$c ... && $b' pattern

---
 tests/test/script/runner/status.test | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'tests/test/script/runner/status.test')

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: .+%
-- 
cgit v1.1