From 5007870b52aa549971824959a55ad3bb886f09e0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 3 Sep 2018 16:37:32 +0200
Subject: Rename .test/test{} to .testscript/testscript{}

---
 tests/directive/assert.test       | 28 ----------------------------
 tests/directive/assert.testscript | 28 ++++++++++++++++++++++++++++
 tests/directive/buildfile         |  2 +-
 tests/directive/run.test          | 37 -------------------------------------
 tests/directive/run.testscript    | 37 +++++++++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 tests/directive/assert.test
 create mode 100644 tests/directive/assert.testscript
 delete mode 100644 tests/directive/run.test
 create mode 100644 tests/directive/run.testscript

(limited to 'tests/directive')

diff --git a/tests/directive/assert.test b/tests/directive/assert.test
deleted file mode 100644
index 2d70573..0000000
--- a/tests/directive/assert.test
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : tests/directive/assert.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-.include ../common.test
-
-$* <'assert true'                     : true
-$* <'assert! false foo'               : not-false
-$* <'assert true $no_such_function()' : skip-line
-$* <'assert! $empty($build.version)'  : expr
-
-: false
-:
-$* <'assert false' 2>>EOE != 0
-<stdin>:1:1: error: assertion failed
-EOE
-
-: false-desc
-:
-$* <'assert false bad thing happened: (a == b)' 2>>EOE != 0
-<stdin>:1:1: error: assertion failed: bad thing happened: false
-EOE
-
-: invalid
-:
-$* <'assert junk' 2>>EOE != 0
-<stdin>:1:8: error: invalid bool value: 'junk'
-EOE
diff --git a/tests/directive/assert.testscript b/tests/directive/assert.testscript
new file mode 100644
index 0000000..ffe6aa0
--- /dev/null
+++ b/tests/directive/assert.testscript
@@ -0,0 +1,28 @@
+# file      : tests/directive/assert.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+.include ../common.testscript
+
+$* <'assert true'                     : true
+$* <'assert! false foo'               : not-false
+$* <'assert true $no_such_function()' : skip-line
+$* <'assert! $empty($build.version)'  : expr
+
+: false
+:
+$* <'assert false' 2>>EOE != 0
+<stdin>:1:1: error: assertion failed
+EOE
+
+: false-desc
+:
+$* <'assert false bad thing happened: (a == b)' 2>>EOE != 0
+<stdin>:1:1: error: assertion failed: bad thing happened: false
+EOE
+
+: invalid
+:
+$* <'assert junk' 2>>EOE != 0
+<stdin>:1:8: error: invalid bool value: 'junk'
+EOE
diff --git a/tests/directive/buildfile b/tests/directive/buildfile
index c03a08d..ac4c752 100644
--- a/tests/directive/buildfile
+++ b/tests/directive/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/directive/run.test b/tests/directive/run.test
deleted file mode 100644
index 30d4a6a..0000000
--- a/tests/directive/run.test
+++ /dev/null
@@ -1,37 +0,0 @@
-# file      : tests/directive/run.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# We are going to run the build system driver so no cross-testing.
-#
-crosstest = false
-
-.include ../common.test
-
-: no-output
-:
-cat <'assert true' >=buildfile;
-$* <"run '$0' noop"
-
-: output
-:
-cat <'print foo=bar' >=buildfile;
-$* <<"EOI" >'bar'
-run '$0' noop
-print \$foo
-EOI
-
-: bad-exit
-:
-cat <'assert false' >=buildfile;
-$* <"run '$0' noop" 2>>EOE != 0
-buildfile:1:1: error: assertion failed
-EOE
-
-: bad-output
-:
-cat <'print run' >=buildfile;
-$* <"run '$0' noop" 2>>"EOE" != 0
-<stdout>:1:4: error: executable name expected after run
-  <stdin>:1:5: info: while parsing $0 output
-EOE
diff --git a/tests/directive/run.testscript b/tests/directive/run.testscript
new file mode 100644
index 0000000..ba4a413
--- /dev/null
+++ b/tests/directive/run.testscript
@@ -0,0 +1,37 @@
+# file      : tests/directive/run.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# We are going to run the build system driver so no cross-testing.
+#
+crosstest = false
+
+.include ../common.testscript
+
+: no-output
+:
+cat <'assert true' >=buildfile;
+$* <"run '$0' noop"
+
+: output
+:
+cat <'print foo=bar' >=buildfile;
+$* <<"EOI" >'bar'
+run '$0' noop
+print \$foo
+EOI
+
+: bad-exit
+:
+cat <'assert false' >=buildfile;
+$* <"run '$0' noop" 2>>EOE != 0
+buildfile:1:1: error: assertion failed
+EOE
+
+: bad-output
+:
+cat <'print run' >=buildfile;
+$* <"run '$0' noop" 2>>"EOE" != 0
+<stdout>:1:4: error: executable name expected after run
+  <stdin>:1:5: info: while parsing $0 output
+EOE
-- 
cgit v1.1