Rename .test/test{} to .testscript/testscript{}

31 files changed, 90 insertions, 66 deletions

diff --git a/tests/auth.test b/tests/auth.testscript
index 0bac0e7..06886db 100644
--- a/tests/auth.test
+++ b/tests/auth.testscript
@@ -1,4 +1,4 @@
-# file      : tests/auth.test
+# file      : tests/auth.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/build/root.build b/tests/build/root.build
index 5818ec1..0c552ae 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -10,7 +10,7 @@ using cxx
 # Setup the bpkg that we are testing.
 #
 import bpkg = bpkg%exe{bpkg}
-test{*}: test = $bpkg
+testscript{*}: test = $bpkg
 
 # Specify the test target for cross-testing.
 #
diff --git a/tests/buildfile b/tests/buildfile
index 0990548..9fa6a8b 100644
--- a/tests/buildfile
+++ b/tests/buildfile
@@ -3,7 +3,7 @@
 # license   : MIT; see accompanying LICENSE file
 
 define common: file
-common{*}: extension = test
+common{*}: extension = testscript
 
 commons = common config auth remote \
           remote-git rep-fetch-git rep-fetch-git-refname rep-fetch-git-commit
@@ -11,4 +11,4 @@ commons = common config auth remote \
 # The common/ directory contains repositories that are reused, being symlinked
 # in source repositories specific for testscripts.
 #
-./: test{* -{$commons}} common{$commons} {*/ -build/ -test/}{**} $bpkg
+./: testscript{* -{$commons}} common{$commons} {*/ -build/ -test/}{**} $bpkg
diff --git a/tests/cfg-create.test b/tests/cfg-create.testscript
index 5466a6e..d5e58e0 100644
--- a/tests/cfg-create.test
+++ b/tests/cfg-create.testscript
@@ -1,8 +1,8 @@
-# file      : tests/cfg-create.test
+# file      : tests/cfg-create.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test
+.include common.testscript
 
 pkg_status += -d cfg
 
diff --git a/tests/common.test b/tests/common.testscript
index ebf0b43..b9739fd 100644
--- a/tests/common.test
+++ b/tests/common.testscript
@@ -1,4 +1,4 @@
-# file      : tests/common.test
+# file      : tests/common.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -37,8 +37,9 @@ rep_info      = $* rep-info
 rep_list      = $* rep-list
 rep_remove    = $* rep-remove
 
-# All testscripts are named after bpkg commands, for example pkg-verify.test.
-# So the testscript scope id is a name of the command being tested.
+# All testscripts are named after bpkg commands, for example
+# pkg-verify.testscript. So the testscript scope id is a name of the command
+# being tested.
 #
 cmd = [string] $@
 test.arguments = $cmd
diff --git a/tests/config.test b/tests/config.testscript
index cd5eb12..bf81799 100644
--- a/tests/config.test
+++ b/tests/config.testscript
@@ -1,4 +1,4 @@
-# file      : tests/config.test
+# file      : tests/config.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/pkg-build.test b/tests/pkg-build.testscript
index d120d0c..f1bfd08 100644
--- a/tests/pkg-build.test
+++ b/tests/pkg-build.testscript
@@ -1,8 +1,11 @@
-# file      : tests/pkg-build.test
+# file      : tests/pkg-build.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote.test remote-git.test
+.include common.testscript \
+	 config.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-checkout.test b/tests/pkg-checkout.testscript
index 7203bfb..d279eb4 100644
--- a/tests/pkg-checkout.test
+++ b/tests/pkg-checkout.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-checkout.test
+# file      : tests/pkg-checkout.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote-git.test
+.include common.testscript config.testscript remote-git.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-clean.test b/tests/pkg-clean.testscript
index 552c82b..0c05557 100644
--- a/tests/pkg-clean.test
+++ b/tests/pkg-clean.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-clean.test
+# file      : tests/pkg-clean.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test
+.include common.testscript auth.testscript config.testscript remote.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-configure.test b/tests/pkg-configure.testscript
index 0813084..a61bb27 100644
--- a/tests/pkg-configure.test
+++ b/tests/pkg-configure.testscript
@@ -1,11 +1,11 @@
-# file      : tests/pkg-configure.test
+# file      : tests/pkg-configure.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Here we test both pkg-configure and pkg-disfigure commands.
 #
 
-.include common.test auth.test config.test remote.test
+.include common.testscript auth.testscript config.testscript remote.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-drop.test b/tests/pkg-drop.testscript
index f0ff50f..8750f80 100644
--- a/tests/pkg-drop.test
+++ b/tests/pkg-drop.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-drop.test
+# file      : tests/pkg-drop.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote.test
+.include common.testscript config.testscript remote.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-fetch.test b/tests/pkg-fetch.testscript
index dfc2ff0..9fc8847 100644
--- a/tests/pkg-fetch.test
+++ b/tests/pkg-fetch.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-fetch.test
+# file      : tests/pkg-fetch.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test
+.include common.testscript auth.testscript config.testscript remote.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-purge.test b/tests/pkg-purge.testscript
index 8bbd3a8..0b677cb 100644
--- a/tests/pkg-purge.test
+++ b/tests/pkg-purge.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-purge.test
+# file      : tests/pkg-purge.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test
+.include common.testscript config.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-status.test b/tests/pkg-status.testscript
index 2845e55..b539f05 100644
--- a/tests/pkg-status.test
+++ b/tests/pkg-status.testscript
@@ -1,8 +1,11 @@
-# file      : tests/pkg-status.test
+# file      : tests/pkg-status.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote.test remote-git.test
+.include common.testscript \
+	 config.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-system.test b/tests/pkg-system.testscript
index a681127..e8ad676 100644
--- a/tests/pkg-system.test
+++ b/tests/pkg-system.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-system.test
+# file      : tests/pkg-system.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test
+.include common.testscript auth.testscript config.testscript remote.testscript
 
 # There is no pkg-system command, and this testscript contains tests for
 # various building scenarios that involves system packages. Note that by that
diff --git a/tests/pkg-test.test b/tests/pkg-test.testscript
index 6e36ffe..17f9b25 100644
--- a/tests/pkg-test.test
+++ b/tests/pkg-test.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-test.test
+# file      : tests/pkg-test.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote.test
+.include common.testscript config.testscript remote.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-unpack.test b/tests/pkg-unpack.testscript
index 1e20b22..f866fd2 100644
--- a/tests/pkg-unpack.test
+++ b/tests/pkg-unpack.testscript
@@ -1,8 +1,12 @@
-# file      : tests/pkg-unpack.test
+# file      : tests/pkg-unpack.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test remote-git.test
+.include common.testscript \
+	 auth.testscript \
+	 config.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-update.test b/tests/pkg-update.testscript
index 73e1221..02a1a3d 100644
--- a/tests/pkg-update.test
+++ b/tests/pkg-update.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-update.test
+# file      : tests/pkg-update.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test
+.include common.testscript auth.testscript config.testscript remote.testscript
 
 # Source repository:
 #
diff --git a/tests/pkg-verify.test b/tests/pkg-verify.testscript
index d438524..559b612 100644
--- a/tests/pkg-verify.test
+++ b/tests/pkg-verify.testscript
@@ -1,8 +1,8 @@
-# file      : tests/pkg-verify.test
+# file      : tests/pkg-verify.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test
+.include common.testscript
 
 # Source repository:
 #
diff --git a/tests/remote-git.test b/tests/remote-git.testscript
index 878f297..6724473 100644
--- a/tests/remote-git.test
+++ b/tests/remote-git.testscript
@@ -1,4 +1,4 @@
-# file      : tests/remote-git.test
+# file      : tests/remote-git.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/remote.test b/tests/remote.testscript
index 51a52bc..aa0ffbf 100644
--- a/tests/remote.test
+++ b/tests/remote.testscript
@@ -1,4 +1,4 @@
-# file      : tests/remote.test
+# file      : tests/remote.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/rep-add.test b/tests/rep-add.testscript
index 8c4b9f9..b57eb68 100644
--- a/tests/rep-add.test
+++ b/tests/rep-add.testscript
@@ -1,8 +1,8 @@
-# file      : tests/rep-add.test
+# file      : tests/rep-add.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test
+.include common.testscript config.testscript
 
 rep_list += -d cfg
 
diff --git a/tests/rep-auth.test b/tests/rep-auth.testscript
index 640f828..ede815b 100644
--- a/tests/rep-auth.test
+++ b/tests/rep-auth.testscript
@@ -1,8 +1,8 @@
-# file      : tests/rep-auth.test
+# file      : tests/rep-auth.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test
+.include common.testscript auth.testscript config.testscript remote.testscript
 
 # There is no rep-auth command, and this testscript contains tests for various
 # authentication scenarios throughout different stages of repositories
diff --git a/tests/rep-create.test b/tests/rep-create.testscript
index 09aeb7f..053902d 100644
--- a/tests/rep-create.test
+++ b/tests/rep-create.testscript
@@ -1,8 +1,8 @@
-# file      : tests/rep-create.test
+# file      : tests/rep-create.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test
+.include common.testscript auth.testscript
 
 # Source repository:
 #
diff --git a/tests/rep-fetch-git-commit.test b/tests/rep-fetch-git-commit.testscript
index 58c9ffe..ff6c7a3 100644
--- a/tests/rep-fetch-git-commit.test
+++ b/tests/rep-fetch-git-commit.testscript
@@ -1,4 +1,4 @@
-# file      : tests/rep-fetch-git-commit.test
+# file      : tests/rep-fetch-git-commit.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/rep-fetch-git-refname.test b/tests/rep-fetch-git-refname.testscript
index a6f9065..fe5b330 100644
--- a/tests/rep-fetch-git-refname.test
+++ b/tests/rep-fetch-git-refname.testscript
@@ -1,4 +1,4 @@
-# file      : tests/rep-fetch-git-refname.test
+# file      : tests/rep-fetch-git-refname.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/rep-fetch-git.test b/tests/rep-fetch-git.testscript
index 804fefc..3fe0287 100644
--- a/tests/rep-fetch-git.test
+++ b/tests/rep-fetch-git.testscript
@@ -1,4 +1,4 @@
-# file      : tests/rep-fetch-git.test
+# file      : tests/rep-fetch-git.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -48,32 +48,32 @@ end
 :
 {
   fragment = '#master'
-  .include rep-fetch-git-refname.test
+  .include rep-fetch-git-refname.testscript
 }
 
 : ltag
 :
 {
   fragment = '#ltag'
-  .include rep-fetch-git-refname.test
+  .include rep-fetch-git-refname.testscript
 }
 
 : atag
 :
 {
   fragment = '#atag'
-  .include rep-fetch-git-refname.test
+  .include rep-fetch-git-refname.testscript
 }
 
 : list
 :
 {
   fragment = '#master,ltag,atag'
-  .include rep-fetch-git-refname.test
+  .include rep-fetch-git-refname.testscript
 }
 
 : commit
 :
 {
-  .include rep-fetch-git-commit.test
+  .include rep-fetch-git-commit.testscript
 }
diff --git a/tests/rep-fetch.test b/tests/rep-fetch.testscript
index c7e9e0f..c1828a8 100644
--- a/tests/rep-fetch.test
+++ b/tests/rep-fetch.testscript
@@ -1,8 +1,12 @@
-# file      : tests/rep-fetch.test
+# file      : tests/rep-fetch.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test config.test remote.test remote-git.test
+.include common.testscript \
+	 auth.testscript \
+	 config.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #
@@ -61,7 +65,7 @@
 # |       |-- libfoo-1.0.0.tar.gz
 # |       `-- repositories.manifest
 # |
-# `-- git/* (see rep-fetch-git.test)
+# `-- git/* (see rep-fetch-git.testscript)
 
 # Prepare repositories used by tests if running in the local mode.
 #
@@ -697,7 +701,7 @@ else
   if ($remote != true)
   {
     git_protocol = 'local'
-    .include rep-fetch-git.test
+    .include rep-fetch-git.testscript
   }
   else
   {
@@ -705,28 +709,28 @@ else
     :
     {
       git_protocol = 'https-dumb'
-      .include rep-fetch-git.test
+      .include rep-fetch-git.testscript
     }
 
     : https-smart
     :
     {
       git_protocol = 'https-smart'
-      .include rep-fetch-git.test
+      .include rep-fetch-git.testscript
     }
 
     : https-smart-unadv
     :
     {
       git_protocol = 'https-smart-unadv'
-      .include rep-fetch-git.test
+      .include rep-fetch-git.testscript
     }
 
     : git
     :
     {
       git_protocol = 'git'
-      .include rep-fetch-git.test
+      .include rep-fetch-git.testscript
     }
   }
 
diff --git a/tests/rep-info.test b/tests/rep-info.testscript
index d7a80a9..3ccbeb6 100644
--- a/tests/rep-info.test
+++ b/tests/rep-info.testscript
@@ -1,8 +1,11 @@
-# file      : tests/rep-info.test
+# file      : tests/rep-info.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test auth.test remote.test remote-git.test
+.include common.testscript \
+	 auth.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #
diff --git a/tests/rep-list.test b/tests/rep-list.testscript
index 63d95ed..978ce73 100644
--- a/tests/rep-list.test
+++ b/tests/rep-list.testscript
@@ -1,8 +1,11 @@
-# file      : tests/rep-list.test
+# file      : tests/rep-list.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote.test remote-git.test
+.include common.testscript \
+	 config.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #
diff --git a/tests/rep-remove.test b/tests/rep-remove.testscript
index c49ee3e..0b7955a 100644
--- a/tests/rep-remove.test
+++ b/tests/rep-remove.testscript
@@ -1,8 +1,11 @@
-# file      : tests/rep-remove.test
+# file      : tests/rep-remove.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include common.test config.test remote.test remote-git.test
+.include common.testscript \
+	 config.testscript \
+	 remote.testscript \
+	 remote-git.testscript
 
 # Source repository:
 #