11 files changed, 27 insertions, 27 deletions
diff --git a/tests/test/script/runner/buildfile b/tests/test/script/runner/buildfile
index 0067ec1..6e8bdd3 100644
--- a/tests/test/script/runner/buildfile
+++ b/tests/test/script/runner/buildfile
@@ -2,9 +2,9 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} exe{driver} $b
+./: testscript{*} exe{driver} $b
 
-test{*}: target = exe{driver}
+testscript{*}: target = exe{driver}
 
 import libs = libbutl%lib{butl}
 exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.testscript
index 2d99215..7ea1acd 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/cleanup.test
+# file      : tests/test/script/runner/cleanup.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 b += --no-column
 
diff --git a/tests/test/script/runner/exit.test b/tests/test/script/runner/exit.testscript
index 7933203..9329ae4 100644
--- a/tests/test/script/runner/exit.test
+++ b/tests/test/script/runner/exit.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/exit.test
+# file      : tests/test/script/runner/exit.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : special
 :
@@ -75,7 +75,7 @@
 : execution
 :
 : Test that only expected commands are executed. Note that we rely on the fact
-: that their execution is performed serially (see ../common.test for details).
+: that their execution is performed serially (see ../common.testscript for details).
 :
 {
   : test-scope
diff --git a/tests/test/script/runner/expr.test b/tests/test/script/runner/expr.testscript
index cfc5277..36c15fd 100644
--- a/tests/test/script/runner/expr.test
+++ b/tests/test/script/runner/expr.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/expr.test
+# file      : tests/test/script/runner/expr.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : short-circuit
 :
diff --git a/tests/test/script/runner/if.test b/tests/test/script/runner/if.testscript
index f22f761..a625c34 100644
--- a/tests/test/script/runner/if.test
+++ b/tests/test/script/runner/if.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/if.test
+# file      : tests/test/script/runner/if.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : if-branch
 :
diff --git a/tests/test/script/runner/output.test b/tests/test/script/runner/output.testscript
index a83c092..ec9ff92 100644
--- a/tests/test/script/runner/output.test
+++ b/tests/test/script/runner/output.testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/output.test
+# file      : tests/test/script/runner/output.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -7,7 +7,7 @@
 # spread the feature tests among several places.
 #
 
-.include ../common.test
+.include ../common.testscript
 
 : after
 :
diff --git a/tests/test/script/runner/pipe.test b/tests/test/script/runner/pipe.testscript
index 03d8b2a..7ef5893 100644
--- a/tests/test/script/runner/pipe.test
+++ b/tests/test/script/runner/pipe.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/pipe.test
+# file      : tests/test/script/runner/pipe.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 $c <'cat <foo | $* -i 1 >foo' && $b  : builtin-to-process
 $c <'$* -o foo | cat >foo' && $b     : process-to-builtin
diff --git a/tests/test/script/runner/redirect.test b/tests/test/script/runner/redirect.testscript
index 13d7219..21e9d07 100644
--- a/tests/test/script/runner/redirect.test
+++ b/tests/test/script/runner/redirect.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/redirect.test
+# file      : tests/test/script/runner/redirect.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 b += --no-column
 
@@ -14,7 +14,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
 {
   cat <'$* -i 1 -e bar <| >| 2>|' >=testscript;
   cat <<EOI >=buildfile;
-  test{testscript}: $target
+  testscript{testscript}: $target
   EOI
   $0 --serial-stop --quiet test <foo >foo 2>bar
 }
@@ -144,7 +144,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
   : regex
   :
   : Test regex matching. Note that tests that check regex parsing are located
-  : in regex.test testscript.
+  : in regex.testscript.
   :
   {
     : match
@@ -401,7 +401,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
   : regex
   :
   : Test regex matching. Note that tests that check regex parsing are located
-  : in regex.test testscript.
+  : in regex.testscript.
   :
   {
     : match
diff --git a/tests/test/script/runner/regex.test b/tests/test/script/runner/regex.testscript
index 018976c..46b1872 100644
--- a/tests/test/script/runner/regex.test
+++ b/tests/test/script/runner/regex.testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/regex.test
+# file      : tests/test/script/runner/regex.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -9,13 +9,13 @@
 #
 # Note that such a tests are separated from ones that check regex matching
 # specifically (in particular matching failures), The latest ones are located
-# in redirect.test testscript.
+# in redirect.testscript.
 #
 # Also note that the following tests are grouped by features: basic
 # functionality, flags, portable-path modifier.
 #
 
-.include ../common.test
+.include ../common.testscript
 
 : basic
 :
diff --git a/tests/test/script/runner/set.test b/tests/test/script/runner/set.testscript
index 2266ae9..b10ce1e 100644
--- a/tests/test/script/runner/set.test
+++ b/tests/test/script/runner/set.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/set.test
+# file      : tests/test/script/runner/set.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : special
 :
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.testscript
index 86d9ca4..1689a69 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/status.test
+# file      : tests/test/script/runner/status.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 b += --no-column