5 files changed, 6 insertions, 99 deletions
diff --git a/tests/test/script/runner/buildfile b/tests/test/script/runner/buildfile
index b9c0e69..e5f2761 100644
--- a/tests/test/script/runner/buildfile
+++ b/tests/test/script/runner/buildfile
@@ -4,9 +4,6 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{driver} $libs test{cleanup mkdir redirect status touch}
-
-if ($cxx.target.class == "windows") # @@ TMP
-  test{*}: ext = ".exe"
+exe{driver}: cxx{driver} $libs test{cleanup redirect status}
 
 include ../../../../../build2/
diff --git a/tests/test/script/runner/mkdir.test b/tests/test/script/runner/mkdir.test
deleted file mode 100644
index 6b7b5c9..0000000
--- a/tests/test/script/runner/mkdir.test
+++ /dev/null
@@ -1,50 +0,0 @@
-# file      : tests/test/script/runner/mkdir.test
-# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-: dirs
-:
-mkdir a b;
-touch a/a b/b
-
-: parent
-:
-mkdir -p a/b;
-touch a/a a/b/b
-
-: exists
-:
-mkdir -p a a a/b a/b
-
-: double-dash
-:
-: Make sure '-p' directory is created.
-:
-mkdir -p -- -p;
-touch -p/a
-
-: no-args
-:
-: Test passing no arguments.
-:
-mkdir 2>"mkdir: missing directory" == 1
-
-: empty-path
-:
-: Test creation of empty directory path.
-:
-mkdir '' 2>"mkdir: invalid path ''" == 1
-
-: already-exists
-:
-: Test creation of an existing directory. Note that error message is
-: platform-dependent so is not checked.
-:
-mkdir a 2>- a == 1 # @@ REGEX
-
-: not-exists
-:
-: Test creation of a directory with non-existent parent. Note that error
-: message is platform-dependent so is not checked.
-:
-mkdir a/b 2>- == 1 # @@ REGEX
diff --git a/tests/test/script/runner/redirect.test b/tests/test/script/runner/redirect.test
index 68cc9aa..16c17d8 100644
--- a/tests/test/script/runner/redirect.test
+++ b/tests/test/script/runner/redirect.test
@@ -166,6 +166,6 @@ EOO
   echo <foo 1>-                     : in-str
   echo "foo" >foo                   : out-str
   echo "foo" 2>foo 1>&2             : err-str
-  cat <foo >foo                     : inout-str # @@ cat is not a builtin yet.
+  cat <foo >foo                     : inout-str
   cat <foo 2>foo 1>&2               : inerr-str
 }
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.test
index f1ad5bf..00d7257 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.test
@@ -15,6 +15,10 @@ b = $build.driver -q --no-column --buildfile - <"./: test{testscript}" \
 c = cat >>>testscript
 test = \'$test\'
 
++if ($cxx.target.class == "windows")
+  ext = ".exe"
+end
+
 # Successfull tests.
 #
 : eq-true
diff --git a/tests/test/script/runner/touch.test b/tests/test/script/runner/touch.test
deleted file mode 100644
index e9d9f68..0000000
--- a/tests/test/script/runner/touch.test
+++ /dev/null
@@ -1,44 +0,0 @@
-# file      : tests/test/script/runner/touch.test
-# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-: file
-:
-touch a
-
-: file-create
-:
-: Test that file is created. If it didn't then 'rm' would fail.
-:
-touch a &!a;
-rm a
-
-: file-update
-:
-: Test that existing file touch doesn't register cleanup. If it did then it
-: would be left dangling after 'rm' call and so test would fail.
-:
-$* -f a;
-touch a;
-rm a
-
-: no-args
-:
-: Test passing no arguments.
-:
-touch 2>"touch: missing file" == 1
-
-: empty-path
-:
-: Test touching an empty path.
-:
-touch '' 2>"touch: invalid path ''" == 1
-
-: dir-update
-:
-: Test touching an existing directory.
-:
-a = [path] $~;
-a += "a";
-mkdir a;
-touch 2>"touch: '$a' exists and is not a file" a == 1