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/builtin/touch.test | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'tests/test/script/builtin/touch.test')

diff --git a/tests/test/script/builtin/touch.test b/tests/test/script/builtin/touch.test
index b3a043e..3a543e8 100644
--- a/tests/test/script/builtin/touch.test
+++ b/tests/test/script/builtin/touch.test
@@ -6,28 +6,25 @@
 
 : file
 :
-$c <'touch a';
-$b
+$c <'touch a' && $b
 
 : file-create
 :
 : Test that file is created. If it didn't then 'rm' would fail.
 :
-$c <<EOI;
+$c <<EOI && $b
 touch a &!a;
 rm a
 EOI
-$b
 
 : file-update
 :
 : Test that existing file touch doesn't fail.
 :
-$c <<EOI;
+$c <<EOI && $b
 cat <"" >=a;
 touch a
 EOI
-$b
 
 : no-cleanup
 :
@@ -35,7 +32,7 @@ $b
 : the file would be removed while leaving the embedded scope, and so the
 : cleanup registered by the first touch would fail.
 :
-$c <<EOI;
+$c <<EOI && $b
 {
   +touch a
   {
@@ -43,32 +40,28 @@ $c <<EOI;
   }
 }
 EOI
-$b
 
 : no-args
 :
 : Test passing no arguments.
 :
-$c <'touch 2>"touch: missing file" == 1';
-$b
+$c <'touch 2>"touch: missing file" == 1' && $b
 
 : empty-path
 :
 : Test touching an empty path.
 :
-$c <<EOI;
+$c <<EOI && $b
 touch '' 2>"touch: invalid path ''" == 1
 EOI
-$b
 
 : dir-update
 :
 : Test touching an existing directory.
 :
-$c <<EOI;
+$c <<EOI && $b
 a = $~;
 a += "a";
 mkdir a;
 touch a 2>"touch: '$a' exists and is not a file" == 1
 EOI
-$b
-- 
cgit v1.1