26 files changed, 61 insertions, 61 deletions
diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile
index 34c5d9f..bbfc032 100644
--- a/unit-tests/test/script/lexer/buildfile
+++ b/unit-tests/test/script/lexer/buildfile
@@ -3,4 +3,4 @@
 # license   : MIT; see accompanying LICENSE file
 
 include ../../../../build2/
-exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b} test{*}
+exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b} testscript{*}
diff --git a/unit-tests/test/script/lexer/command-expansion.test b/unit-tests/test/script/lexer/command-expansion.testscript
index 88d7ced..228fb61 100644
--- a/unit-tests/test/script/lexer/command-expansion.test
+++ b/unit-tests/test/script/lexer/command-expansion.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/command-expansion.test
+# file      : unit-tests/test/script/lexer/command-expansion.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/lexer/command-line.test b/unit-tests/test/script/lexer/command-line.testscript
index 0b396b8..f84bc86 100644
--- a/unit-tests/test/script/lexer/command-line.test
+++ b/unit-tests/test/script/lexer/command-line.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/command-line.test
+# file      : unit-tests/test/script/lexer/command-line.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/lexer/description-line.test b/unit-tests/test/script/lexer/description-line.testscript
index 5f2ea13..e14c8a0 100644
--- a/unit-tests/test/script/lexer/description-line.test
+++ b/unit-tests/test/script/lexer/description-line.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/description-line.test
+# file      : unit-tests/test/script/lexer/description-line.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/lexer/first-token.test b/unit-tests/test/script/lexer/first-token.testscript
index d754d69..0484b6d 100644
--- a/unit-tests/test/script/lexer/first-token.test
+++ b/unit-tests/test/script/lexer/first-token.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/first-token.test
+# file      : unit-tests/test/script/lexer/first-token.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/lexer/second-token.test b/unit-tests/test/script/lexer/second-token.testscript
index 8b3f452..d7cc501 100644
--- a/unit-tests/test/script/lexer/second-token.test
+++ b/unit-tests/test/script/lexer/second-token.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/second-token.test
+# file      : unit-tests/test/script/lexer/second-token.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/lexer/variable-line.test b/unit-tests/test/script/lexer/variable-line.testscript
index 68d3a71..b28bc93 100644
--- a/unit-tests/test/script/lexer/variable-line.test
+++ b/unit-tests/test/script/lexer/variable-line.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/variable-line.test
+# file      : unit-tests/test/script/lexer/variable-line.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/lexer/variable.test b/unit-tests/test/script/lexer/variable.testscript
index 60106ab..b4f793e 100644
--- a/unit-tests/test/script/lexer/variable.test
+++ b/unit-tests/test/script/lexer/variable.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/lexer/variable.test
+# file      : unit-tests/test/script/lexer/variable.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile
index ee0e26d..173b15d 100644
--- a/unit-tests/test/script/parser/buildfile
+++ b/unit-tests/test/script/parser/buildfile
@@ -3,4 +3,4 @@
 # license   : MIT; see accompanying LICENSE file
 
 include ../../../../build2/
-exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b} test{*}
+exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b} testscript{*}
diff --git a/unit-tests/test/script/parser/cleanup.test b/unit-tests/test/script/parser/cleanup.testscript
index 1b43c90..b429f5d 100644
--- a/unit-tests/test/script/parser/cleanup.test
+++ b/unit-tests/test/script/parser/cleanup.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/cleanup.test
+# file      : unit-tests/test/script/parser/cleanup.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/command-if.test b/unit-tests/test/script/parser/command-if.testscript
index 4936553..264c522 100644
--- a/unit-tests/test/script/parser/command-if.test
+++ b/unit-tests/test/script/parser/command-if.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/command-if.test
+# file      : unit-tests/test/script/parser/command-if.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/command-re-parse.test b/unit-tests/test/script/parser/command-re-parse.testscript
index a6ef6d3..b137b0e 100644
--- a/unit-tests/test/script/parser/command-re-parse.test
+++ b/unit-tests/test/script/parser/command-re-parse.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/command-re-parse.test
+# file      : unit-tests/test/script/parser/command-re-parse.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/description.test b/unit-tests/test/script/parser/description.testscript
index e651a4a..1945cd2 100644
--- a/unit-tests/test/script/parser/description.test
+++ b/unit-tests/test/script/parser/description.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/description.test
+# file      : unit-tests/test/script/parser/description.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/directive.test b/unit-tests/test/script/parser/directive.testscript
index 66bae0d..82fc471 100644
--- a/unit-tests/test/script/parser/directive.test
+++ b/unit-tests/test/script/parser/directive.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/directive.test
+# file      : unit-tests/test/script/parser/directive.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -6,11 +6,11 @@
 :
 $* <<EOI >>EOO
 x = x
-".include" foo.test
-\.include foo.test
+".include" foo.testscript
+\.include foo.testscript
 EOI
-.include foo.test
-.include foo.test
+.include foo.testscript
+.include foo.testscript
 EOO
 
 : expected-name
@@ -31,26 +31,26 @@ EOE
 
 : separated
 :
-touch foo.test;
+touch foo.testscript;
 $* <<EOI
-.  include foo.test
+.  include foo.testscript
 EOI
 
 : not-separated
 :
-touch foo.test;
+touch foo.testscript;
 $* <<EOI
-x = foo.test
+x = foo.testscript
 .include$x
 EOI
 
 : var-expansion
 :
-cat <<EOI >="foo-$(build.verson.project).test";
+cat <<EOI >="foo-$(build.verson.project).testscript";
 cmd
 EOI
 $* <<EOI >>EOO
-.include "foo-$(build.verson.project).test"
+.include "foo-$(build.verson.project).testscript"
 EOI
 cmd
 EOO
@@ -59,7 +59,7 @@ EOO
 :
 $* <<EOI 2>>EOE != 0
 cmd;
-.include foo.test
+.include foo.testscript
 EOI
 testscript:2:1: error: directive after ';'
 EOE
@@ -67,8 +67,8 @@ EOE
 : semi-after
 :
 $* <<EOI 2>>EOE != 0
-.include foo.test;
+.include foo.testscript;
 cmd
 EOI
-testscript:1:18: error: ';' after directive
+testscript:1:24: error: ';' after directive
 EOE
diff --git a/unit-tests/test/script/parser/exit.test b/unit-tests/test/script/parser/exit.testscript
index 3c796f1..af3707d 100644
--- a/unit-tests/test/script/parser/exit.test
+++ b/unit-tests/test/script/parser/exit.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/exit.test
+# file      : unit-tests/test/script/parser/exit.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/expansion.test b/unit-tests/test/script/parser/expansion.testscript
index e161c2c..710d7a1 100644
--- a/unit-tests/test/script/parser/expansion.test
+++ b/unit-tests/test/script/parser/expansion.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/expansion.test
+# file      : unit-tests/test/script/parser/expansion.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/here-document.test b/unit-tests/test/script/parser/here-document.testscript
index 9aebed4..ad2be7d 100644
--- a/unit-tests/test/script/parser/here-document.test
+++ b/unit-tests/test/script/parser/here-document.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/here-document.test
+# file      : unit-tests/test/script/parser/here-document.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/here-string.test b/unit-tests/test/script/parser/here-string.testscript
index f5e3c94..a9e42c0 100644
--- a/unit-tests/test/script/parser/here-string.test
+++ b/unit-tests/test/script/parser/here-string.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/here-string.test
+# file      : unit-tests/test/script/parser/here-string.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/include.test b/unit-tests/test/script/parser/include.testscript
index 99e17de..5e31f0d 100644
--- a/unit-tests/test/script/parser/include.test
+++ b/unit-tests/test/script/parser/include.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/include.test
+# file      : unit-tests/test/script/parser/include.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -11,27 +11,27 @@ EOI
 
 : empty
 :
-touch foo.test;
+touch foo.testscript;
 $* <<EOI
-.include foo.test
-.include --once foo.test
+.include foo.testscript
+.include --once foo.testscript
 EOI
 
 : one
 :
-cat <"cmd" >=foo.test;
+cat <"cmd" >=foo.testscript;
 $* <<EOI >>EOO
-.include foo.test
+.include foo.testscript
 EOI
 cmd
 EOO
 
 : multiple
 :
-cat <"cmd foo" >=foo.test;
-cat <"cmd bar" >=bar.test;
+cat <"cmd foo" >=foo.testscript;
+cat <"cmd bar" >=bar.testscript;
 $* <<EOI >>EOO
-.include foo.test bar.test
+.include foo.testscript bar.testscript
 EOI
 cmd foo
 cmd bar
@@ -39,14 +39,14 @@ EOO
 
 : once
 :
-cat <"cmd" >=foo.test;
+cat <"cmd" >=foo.testscript;
 $* <<EOI >>EOO
-.include foo.test
+.include foo.testscript
 x
-.include --once foo.test
-.include --once bar/../foo.test
+.include --once foo.testscript
+.include --once bar/../foo.testscript
 y
-.include ../once/foo.test
+.include ../once/foo.testscript
 EOI
 cmd
 x
@@ -56,14 +56,14 @@ EOO
 
 : group-id
 :
-cat <<EOI >=foo.test;
+cat <<EOI >=foo.testscript;
 {
   x = b
 }
 EOI
 $* -s -i <<EOI >>EOO
 x = a
-.include foo.test
+.include foo.testscript
 EOI
 {
   { # 2-foo-1
@@ -73,12 +73,12 @@ EOO
 
 : test-id
 :
-cat <<EOI >=foo.test;
+cat <<EOI >=foo.testscript;
 cmd
 EOI
 $* -s -i <<EOI >>EOO
 x = a
-.include foo.test
+.include foo.testscript
 EOI
 {
   { # 2-foo-1
@@ -98,7 +98,7 @@ EOE
 : unable-open
 :
 $* <<EOI 2>>~/EOE/ != 0
-.include foo.test
+.include foo.testscript
 EOI
-/testscript:1:2: error: unable to read testscript foo.test: .+/
+/testscript:1:2: error: unable to read testscript foo.testscript: .+/
 EOE
diff --git a/unit-tests/test/script/parser/pipe-expr.test b/unit-tests/test/script/parser/pipe-expr.testscript
index 3b06da3..7086181 100644
--- a/unit-tests/test/script/parser/pipe-expr.test
+++ b/unit-tests/test/script/parser/pipe-expr.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/pipe-expr.test
+# file      : unit-tests/test/script/parser/pipe-expr.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/pre-parse.test b/unit-tests/test/script/parser/pre-parse.testscript
index b1f4209..d37f972 100644
--- a/unit-tests/test/script/parser/pre-parse.test
+++ b/unit-tests/test/script/parser/pre-parse.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/pre-parse.test
+# file      : unit-tests/test/script/parser/pre-parse.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/redirect.test b/unit-tests/test/script/parser/redirect.testscript
index 766d6cc..4001a3b 100644
--- a/unit-tests/test/script/parser/redirect.test
+++ b/unit-tests/test/script/parser/redirect.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/redirect.test
+# file      : unit-tests/test/script/parser/redirect.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/regex.test b/unit-tests/test/script/parser/regex.testscript
index d8ebb68..67832eb 100644
--- a/unit-tests/test/script/parser/regex.test
+++ b/unit-tests/test/script/parser/regex.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/regex.test
+# file      : unit-tests/test/script/parser/regex.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/scope-if.test b/unit-tests/test/script/parser/scope-if.testscript
index c0cf6fb..c76fab7 100644
--- a/unit-tests/test/script/parser/scope-if.test
+++ b/unit-tests/test/script/parser/scope-if.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/scope-if.test
+# file      : unit-tests/test/script/parser/scope-if.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/unit-tests/test/script/parser/scope.test b/unit-tests/test/script/parser/scope.testscript
index 21a6f50..721e455 100644
--- a/unit-tests/test/script/parser/scope.test
+++ b/unit-tests/test/script/parser/scope.testscript
@@ -1,9 +1,9 @@
-# file      : unit-tests/test/script/parser/scope.test
+# file      : unit-tests/test/script/parser/scope.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-$* testscript <'cmd $@' >"cmd 1"     : id-testscript
-$* foo.test   <'cmd $@' >"cmd foo/1" : id
+$* testscript     <'cmd $@' >"cmd 1"     : id-testscript
+$* foo.testscript <'cmd $@' >"cmd foo/1" : id
 
 : wd-testscript
 :
@@ -11,7 +11,7 @@ $* testscript <'cmd "$~"' >~"%cmd '?.+[/\\\\]test-driver[/\\\\]1'?%"
 
 : wd
 :
-$* foo.test <'cmd "$~"' >~"%cmd '?.+[/\\\\]test-driver[/\\\\]foo[/\\\\]1'?%"
+$* foo.testscript <'cmd "$~"' >~"%cmd '?.+[/\\\\]test-driver[/\\\\]foo[/\\\\]1'?%"
 
 : group
 :
diff --git a/unit-tests/test/script/parser/setup-teardown.test b/unit-tests/test/script/parser/setup-teardown.testscript
index f9cbb04..12fde8c 100644
--- a/unit-tests/test/script/parser/setup-teardown.test
+++ b/unit-tests/test/script/parser/setup-teardown.testscript
@@ -1,4 +1,4 @@
-# file      : unit-tests/test/script/parser/setup-teardown.test
+# file      : unit-tests/test/script/parser/setup-teardown.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file