Tests cleanup

1 files changed, 26 insertions, 4 deletions

diff --git a/tests/test/script/builtin/mkdir.test b/tests/test/script/builtin/mkdir.test
index dafcd35..07b6090 100644
--- a/tests/test/script/builtin/mkdir.test
+++ b/tests/test/script/builtin/mkdir.test
@@ -2,38 +2,54 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
+.include ../common.test
+
 : dirs
 :
+$c <<EOI;
 mkdir a b;
 touch a/a b/b
+EOI
+$b
 
 : parent
 :
+$c <<EOI;
 mkdir -p a/b;
 touch a/a a/b/b
+EOI
+$b
 
 : exists
 :
-mkdir -p a a a/b a/b
+$c <'mkdir -p a a a/b a/b';
+$b
 
 : double-dash
 :
 : Make sure '-p' directory is created.
 :
+$c <<EOI;
 mkdir -p -- -p;
 touch -p/a
+EOI
+$b
 
 : no-args
 :
 : Test passing no arguments.
 :
-mkdir 2>"mkdir: missing directory" == 1
+$c <'mkdir 2>"mkdir: missing directory" == 1';
+$b
 
 : empty-path
 :
 : Test creation of empty directory path.
 :
+$c <<EOI;
 mkdir '' 2>"mkdir: invalid path ''" == 1
+EOI
+$b
 
 : already-exists
 :
@@ -42,10 +58,13 @@ mkdir '' 2>"mkdir: invalid path ''" == 1
 : Note that there is an optional trailing blank line in the regex that matches
 : the newline added by msvcrt as a part of the error description.
 :
+$c <<EOI;
 mkdir a a 2>>~%EOE% == 1
-%mkdir: unable to create directory '.+[/\\]test[/\\]mkdir[/\\]already-exists[/\\]a': .+%
+%mkdir: unable to create directory '.+[/\\]test[/\\]mkdir[/\\]already-exists[/\\]test[/\\]1[/\\]a': .+%
 %%?
 EOE
+EOI
+$b
 
 : not-exists
 :
@@ -54,7 +73,10 @@ EOE
 : Note that there is an optional trailing blank line in the regex that matches
 : the newline added by msvcrt as a part of the error description.
 :
+$c <<EOI;
 mkdir a/b 2>>~%EOE% == 1
-%mkdir: unable to create directory '.+[/\\]test[/\\]mkdir[/\\]not-exists[/\\]a[/\\]b': .+%
+%mkdir: unable to create directory '.+[/\\]test[/\\]mkdir[/\\]not-exists[/\\]test[/\\]1[/\\]a[/\\]b': .+%
 %%?
 EOE
+EOI
+$b