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/mkdir.test | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

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

diff --git a/tests/test/script/builtin/mkdir.test b/tests/test/script/builtin/mkdir.test
index ace4012..8f97fe3 100644
--- a/tests/test/script/builtin/mkdir.test
+++ b/tests/test/script/builtin/mkdir.test
@@ -6,69 +6,61 @@
 
 : dirs
 :
-$c <<EOI;
+$c <<EOI && $b
 mkdir a b;
 touch a/a b/b
 EOI
-$b
 
 : parent
 :
-$c <<EOI;
+$c <<EOI && $b
 mkdir -p a/b;
 touch a/a a/b/b
 EOI
-$b
 
 : exists
 :
-$c <'mkdir -p a a a/b a/b';
-$b
+$c <'mkdir -p a a a/b a/b' && $b
 
 : double-dash
 :
 : Make sure '-p' directory is created.
 :
-$c <<EOI;
+$c <<EOI && $b
 mkdir -p -- -p;
 touch -p/a
 EOI
-$b
 
 : no-args
 :
 : Test passing no arguments.
 :
-$c <'mkdir 2>"mkdir: missing directory" == 1';
-$b
+$c <'mkdir 2>"mkdir: missing directory" == 1' && $b
 
 : empty-path
 :
 : Test creation of empty directory path.
 :
-$c <<EOI;
+$c <<EOI && $b
 mkdir '' 2>"mkdir: invalid path ''" == 1
 EOI
-$b
 
 : already-exists
 :
 : Test creation of an existing directory.
 :
-$c <<EOI;
+$c <<EOI && $b
 mkdir a a 2>>/~%EOE% == 1
 %mkdir: unable to create directory '.+/test/mkdir/already-exists/test/1/a': .+%
 EOE
 EOI
-$b
 
 : not-exists
 :
 : Test creation of a directory with non-existent parent.
 :
-$c <<EOI;
+$c <<EOI && $b
 mkdir a/b 2>>/~%EOE% == 1
 %mkdir: unable to create directory '.+/test/mkdir/not-exists/test/1/a/b': .+%
 EOE
 EOI
-$b
-- 
cgit v1.1