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/expansion/buildfile         |  2 +-
 tests/expansion/concat.test       | 28 ----------------------
 tests/expansion/concat.testscript | 28 ++++++++++++++++++++++
 tests/expansion/type.test         | 50 ---------------------------------------
 tests/expansion/type.testscript   | 50 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 79 insertions(+), 79 deletions(-)
 delete mode 100644 tests/expansion/concat.test
 create mode 100644 tests/expansion/concat.testscript
 delete mode 100644 tests/expansion/type.test
 create mode 100644 tests/expansion/type.testscript

(limited to 'tests/expansion')

diff --git a/tests/expansion/buildfile b/tests/expansion/buildfile
index c144c23..7a73b9d 100644
--- a/tests/expansion/buildfile
+++ b/tests/expansion/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/expansion/concat.test b/tests/expansion/concat.test
deleted file mode 100644
index baaf1e1..0000000
--- a/tests/expansion/concat.test
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : tests/expansion/type.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test concatenated expansion.
-
-.include ../common.test
-
-: typed-exceptions
-:
-$* <<EOI >>/EOO
-d = [dir_path] dir
-s = [string] foo
-
-print $d/{bar}
-print $s{bar}
-print $d/$s{bar}
-print file{x$s}
-print $d/{x$s}
-print prj%{x$s}
-EOI
-dir/bar
-foo{bar}
-dir/foo{bar}
-file{xfoo}
-dir/xfoo
-prj%xfoo
-EOO
diff --git a/tests/expansion/concat.testscript b/tests/expansion/concat.testscript
new file mode 100644
index 0000000..75487b5
--- /dev/null
+++ b/tests/expansion/concat.testscript
@@ -0,0 +1,28 @@
+# file      : tests/expansion/type.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test concatenated expansion.
+
+.include ../common.testscript
+
+: typed-exceptions
+:
+$* <<EOI >>/EOO
+d = [dir_path] dir
+s = [string] foo
+
+print $d/{bar}
+print $s{bar}
+print $d/$s{bar}
+print file{x$s}
+print $d/{x$s}
+print prj%{x$s}
+EOI
+dir/bar
+foo{bar}
+dir/foo{bar}
+file{xfoo}
+dir/xfoo
+prj%xfoo
+EOO
diff --git a/tests/expansion/type.test b/tests/expansion/type.test
deleted file mode 100644
index 8899aa3..0000000
--- a/tests/expansion/type.test
+++ /dev/null
@@ -1,50 +0,0 @@
-# file      : tests/expansion/type.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test type propagation during expansion.
-
-.include ../common.test
-
-: var
-:
-$* <<EOI
-x = [bool] true
-y = $x
-assert ($type($y) == bool)
-EOI
-
-: eval
-:
-$* <<EOI
-y = ([bool] true)
-assert ($type($y) == bool)
-EOI
-
-: func
-:
-$* <<EOI
-y = $identity([bool] true)
-assert ($type($y) == bool)
-EOI
-
-: untypify
-:
-$* <<EOI
-x = [bool] true
-y = "$x"
-assert ($type($y) == "")
-EOI
-
-: retypify
-:
-$* <'print [bool] ([string] true)' >'true'
-
-: retypify-quote
-:
-$* <'print [bool] "([string] true)"' >'true'
-
-: retypify-name
-: Test the "steal" case of untypify()
-:
-$* <'print [bool] "([name] true)"' >'true'
diff --git a/tests/expansion/type.testscript b/tests/expansion/type.testscript
new file mode 100644
index 0000000..12204a3
--- /dev/null
+++ b/tests/expansion/type.testscript
@@ -0,0 +1,50 @@
+# file      : tests/expansion/type.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test type propagation during expansion.
+
+.include ../common.testscript
+
+: var
+:
+$* <<EOI
+x = [bool] true
+y = $x
+assert ($type($y) == bool)
+EOI
+
+: eval
+:
+$* <<EOI
+y = ([bool] true)
+assert ($type($y) == bool)
+EOI
+
+: func
+:
+$* <<EOI
+y = $identity([bool] true)
+assert ($type($y) == bool)
+EOI
+
+: untypify
+:
+$* <<EOI
+x = [bool] true
+y = "$x"
+assert ($type($y) == "")
+EOI
+
+: retypify
+:
+$* <'print [bool] ([string] true)' >'true'
+
+: retypify-quote
+:
+$* <'print [bool] "([string] true)"' >'true'
+
+: retypify-name
+: Test the "steal" case of untypify()
+:
+$* <'print [bool] "([name] true)"' >'true'
-- 
cgit v1.1