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/eval/buildfile          |  2 +-
 tests/eval/comma.test         | 13 ------------
 tests/eval/comma.testscript   | 13 ++++++++++++
 tests/eval/comp.test          | 47 -------------------------------------------
 tests/eval/comp.testscript    | 47 +++++++++++++++++++++++++++++++++++++++++++
 tests/eval/or-and.test        | 28 --------------------------
 tests/eval/or-and.testscript  | 28 ++++++++++++++++++++++++++
 tests/eval/qual.test          | 28 --------------------------
 tests/eval/qual.testscript    | 28 ++++++++++++++++++++++++++
 tests/eval/ternary.test       | 30 ---------------------------
 tests/eval/ternary.testscript | 30 +++++++++++++++++++++++++++
 tests/eval/value.test         | 23 ---------------------
 tests/eval/value.testscript   | 23 +++++++++++++++++++++
 13 files changed, 170 insertions(+), 170 deletions(-)
 delete mode 100644 tests/eval/comma.test
 create mode 100644 tests/eval/comma.testscript
 delete mode 100644 tests/eval/comp.test
 create mode 100644 tests/eval/comp.testscript
 delete mode 100644 tests/eval/or-and.test
 create mode 100644 tests/eval/or-and.testscript
 delete mode 100644 tests/eval/qual.test
 create mode 100644 tests/eval/qual.testscript
 delete mode 100644 tests/eval/ternary.test
 create mode 100644 tests/eval/ternary.testscript
 delete mode 100644 tests/eval/value.test
 create mode 100644 tests/eval/value.testscript

(limited to 'tests/eval')

diff --git a/tests/eval/buildfile b/tests/eval/buildfile
index 8fa0064..f7fa2d5 100644
--- a/tests/eval/buildfile
+++ b/tests/eval/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/eval/comma.test b/tests/eval/comma.test
deleted file mode 100644
index 1a36dd1..0000000
--- a/tests/eval/comma.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : tests/eval/comma.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test value packs (eval-comma).
-
-.include ../common.test
-
-: comma
-:
-$* <'print (foo, bar)' 2>>EOE != 0
-<stdin>:1:7: error: expected single value
-EOE
diff --git a/tests/eval/comma.testscript b/tests/eval/comma.testscript
new file mode 100644
index 0000000..bb748d1
--- /dev/null
+++ b/tests/eval/comma.testscript
@@ -0,0 +1,13 @@
+# file      : tests/eval/comma.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test value packs (eval-comma).
+
+.include ../common.testscript
+
+: comma
+:
+$* <'print (foo, bar)' 2>>EOE != 0
+<stdin>:1:7: error: expected single value
+EOE
diff --git a/tests/eval/comp.test b/tests/eval/comp.test
deleted file mode 100644
index c1a4cf7..0000000
--- a/tests/eval/comp.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# file      : tests/eval/comp.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test comparison operators (eval-comp).
-
-.include ../common.test
-
-$* <'print (foo == bar)' >'false' : eq-false
-$* <'print (foo == foo)' >'true'  : eq-true
-
-$* <'print (foo != foo)' >'false' : ne-false
-$* <'print (foo != bar)' >'true'  : ne-true
-
-$* <'print (foo < bar)' >'false'  : lt-false
-$* <'print (bar < foo)' >'true'   : lt-true
-
-$* <'print (bar > foo)' >'false'  : gt-false
-$* <'print (foo > bar)' >'true'   : gt-true
-
-$* <'print (foo <= bar)' >'false' : le-false
-$* <'print (bar <= foo)' >'true'  : le-true
-$* <'print (bar <= bar)' >'true'  : le-true-eq
-
-$* <'print (bar >= foo)' >'false' : ge-false
-$* <'print (foo >= bar)' >'true'  : ge-true
-$* <'print (foo >= foo)' >'true'  : ge-true-eq
-
-: associativity
-:
-$* <'print (foo == bar == false)' >'true'
-
-: type
-:
-{
-  $* <'print ((foo bar) == foo bar)' >'true' : untyped-list
-  $* <'print ("" == "")' >'true'             : untyped-empty
-
-  $* <'print (0 < 00)'                   >'true'     : untyped-untyped
-  $* <'print (0 < [null])'               >'false'    : untyped-null
-  $* <'print ([uint64] 00 < 0)'          >'false'    : uint64-untyped
-  $* <'print ([uint64] 00 < [null])'     >'false'    : uint64-null
-  $* <'print ([uint64] 00 < [uint64] 0)' >'false'    : uint64-uint64
-  $* <'print ([uint64] 00 < [string] 0)' 2>>EOE != 0 : uint64-string
-  <stdin>:1:20: error: comparison between uint64 and string
-  EOE
-}
diff --git a/tests/eval/comp.testscript b/tests/eval/comp.testscript
new file mode 100644
index 0000000..481c50b
--- /dev/null
+++ b/tests/eval/comp.testscript
@@ -0,0 +1,47 @@
+# file      : tests/eval/comp.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test comparison operators (eval-comp).
+
+.include ../common.testscript
+
+$* <'print (foo == bar)' >'false' : eq-false
+$* <'print (foo == foo)' >'true'  : eq-true
+
+$* <'print (foo != foo)' >'false' : ne-false
+$* <'print (foo != bar)' >'true'  : ne-true
+
+$* <'print (foo < bar)' >'false'  : lt-false
+$* <'print (bar < foo)' >'true'   : lt-true
+
+$* <'print (bar > foo)' >'false'  : gt-false
+$* <'print (foo > bar)' >'true'   : gt-true
+
+$* <'print (foo <= bar)' >'false' : le-false
+$* <'print (bar <= foo)' >'true'  : le-true
+$* <'print (bar <= bar)' >'true'  : le-true-eq
+
+$* <'print (bar >= foo)' >'false' : ge-false
+$* <'print (foo >= bar)' >'true'  : ge-true
+$* <'print (foo >= foo)' >'true'  : ge-true-eq
+
+: associativity
+:
+$* <'print (foo == bar == false)' >'true'
+
+: type
+:
+{
+  $* <'print ((foo bar) == foo bar)' >'true' : untyped-list
+  $* <'print ("" == "")' >'true'             : untyped-empty
+
+  $* <'print (0 < 00)'                   >'true'     : untyped-untyped
+  $* <'print (0 < [null])'               >'false'    : untyped-null
+  $* <'print ([uint64] 00 < 0)'          >'false'    : uint64-untyped
+  $* <'print ([uint64] 00 < [null])'     >'false'    : uint64-null
+  $* <'print ([uint64] 00 < [uint64] 0)' >'false'    : uint64-uint64
+  $* <'print ([uint64] 00 < [string] 0)' 2>>EOE != 0 : uint64-string
+  <stdin>:1:20: error: comparison between uint64 and string
+  EOE
+}
diff --git a/tests/eval/or-and.test b/tests/eval/or-and.test
deleted file mode 100644
index 796f92a..0000000
--- a/tests/eval/or-and.test
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : tests/eval/or-and.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test logical operators (eval-or, eval-and).
-
-.include ../common.test
-
-$* <'print (false || false)' >'false' : or-false
-$* <'print (false || true)'  >'true'  : or-true-1
-$* <'print (true  || false)' >'true'  : or-true-2
-
-$* <'print (false && true)'  >'false' : and-false-1
-$* <'print (true  && false)' >'false' : and-false-2
-$* <'print (true  && true)'  >'true'  : and-true
-
-: associativity
-:
-: Also tests short-circuit.
-:
-{
-  $* <'print (true  || $bogus($foo) || false)' >'true'  : or
-  $* <'print (false && $bogus($foo) && false)' >'false' : and
-}
-
-: priority
-:
-$* <'print (false && true || true)' >'true'
diff --git a/tests/eval/or-and.testscript b/tests/eval/or-and.testscript
new file mode 100644
index 0000000..7796f74
--- /dev/null
+++ b/tests/eval/or-and.testscript
@@ -0,0 +1,28 @@
+# file      : tests/eval/or-and.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test logical operators (eval-or, eval-and).
+
+.include ../common.testscript
+
+$* <'print (false || false)' >'false' : or-false
+$* <'print (false || true)'  >'true'  : or-true-1
+$* <'print (true  || false)' >'true'  : or-true-2
+
+$* <'print (false && true)'  >'false' : and-false-1
+$* <'print (true  && false)' >'false' : and-false-2
+$* <'print (true  && true)'  >'true'  : and-true
+
+: associativity
+:
+: Also tests short-circuit.
+:
+{
+  $* <'print (true  || $bogus($foo) || false)' >'true'  : or
+  $* <'print (false && $bogus($foo) && false)' >'false' : and
+}
+
+: priority
+:
+$* <'print (false && true || true)' >'true'
diff --git a/tests/eval/qual.test b/tests/eval/qual.test
deleted file mode 100644
index babd956..0000000
--- a/tests/eval/qual.test
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : tests/eval/qual.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test qualified name (eval-qual).
-
-.include ../common.test
-
-$* <'print (file{foo}: bar)' >'file{foo}:bar' : target
-$* <'print (foo/dir{}: bar)' >'dir{foo/}:bar' : scope
-
-: attribute
-:
-$* <'([string] foo:bar)' 2>>EOE != 0
-<stdin>:1:2: error: attributes before target-qualified variable name
-EOE
-
-: leader
-:
-$* <'(foo == foo:bar)' 2>>EOE != 0
-<stdin>:1:12: error: unexpected ':'
-EOE
-
-: trailer
-:
-$* <'(foo:bar == foo)' 2>>EOE != 0
-<stdin>:1:10: error: expected ')' after variable name
-EOE
diff --git a/tests/eval/qual.testscript b/tests/eval/qual.testscript
new file mode 100644
index 0000000..e7bf472
--- /dev/null
+++ b/tests/eval/qual.testscript
@@ -0,0 +1,28 @@
+# file      : tests/eval/qual.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test qualified name (eval-qual).
+
+.include ../common.testscript
+
+$* <'print (file{foo}: bar)' >'file{foo}:bar' : target
+$* <'print (foo/dir{}: bar)' >'dir{foo/}:bar' : scope
+
+: attribute
+:
+$* <'([string] foo:bar)' 2>>EOE != 0
+<stdin>:1:2: error: attributes before target-qualified variable name
+EOE
+
+: leader
+:
+$* <'(foo == foo:bar)' 2>>EOE != 0
+<stdin>:1:12: error: unexpected ':'
+EOE
+
+: trailer
+:
+$* <'(foo:bar == foo)' 2>>EOE != 0
+<stdin>:1:10: error: expected ')' after variable name
+EOE
diff --git a/tests/eval/ternary.test b/tests/eval/ternary.test
deleted file mode 100644
index a220110..0000000
--- a/tests/eval/ternary.test
+++ /dev/null
@@ -1,30 +0,0 @@
-# file      : tests/eval/ternary.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test the ternary operator (eval-ternary).
-
-.include ../common.test
-
-$* <'print (true  ? foo : bar)' >'foo' : true
-$* <'print (false ? foo : bar)' >'bar' : false
-
-: associativity
-:
-{
-  $* <'print (true  ? false ? foo : bar : baz)'               >'bar' : middle
-  $* <'print (true  ? foo : true ? bar : baz)'                >'foo' : right
-  $* <'print (true  ? false ? foo : bar : true ? baz : fox)'  >'bar' : both
-  $* <'print (false ? foo ? false ? bar : false : baz : fox)' >'fox' : chain
-}
-
-: short-circuit
-:
-{
-  $* <'print (false ? $bogus() : foo)'       >'foo' : middle
-  $* <'print (true  ? foo      : $bogus())'  >'foo' : right
-
-  # @@ TODO: complate pre-parse support in parse_name().
-  #
-  #$* <'print (true  ? foo      : $out_base/{foo bar})'  >'foo' : pre-parse
-}
diff --git a/tests/eval/ternary.testscript b/tests/eval/ternary.testscript
new file mode 100644
index 0000000..fc405e5
--- /dev/null
+++ b/tests/eval/ternary.testscript
@@ -0,0 +1,30 @@
+# file      : tests/eval/ternary.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test the ternary operator (eval-ternary).
+
+.include ../common.testscript
+
+$* <'print (true  ? foo : bar)' >'foo' : true
+$* <'print (false ? foo : bar)' >'bar' : false
+
+: associativity
+:
+{
+  $* <'print (true  ? false ? foo : bar : baz)'               >'bar' : middle
+  $* <'print (true  ? foo : true ? bar : baz)'                >'foo' : right
+  $* <'print (true  ? false ? foo : bar : true ? baz : fox)'  >'bar' : both
+  $* <'print (false ? foo ? false ? bar : false : baz : fox)' >'fox' : chain
+}
+
+: short-circuit
+:
+{
+  $* <'print (false ? $bogus() : foo)'       >'foo' : middle
+  $* <'print (true  ? foo      : $bogus())'  >'foo' : right
+
+  # @@ TODO: complate pre-parse support in parse_name().
+  #
+  #$* <'print (true  ? foo      : $out_base/{foo bar})'  >'foo' : pre-parse
+}
diff --git a/tests/eval/value.test b/tests/eval/value.test
deleted file mode 100644
index a3e1d4c..0000000
--- a/tests/eval/value.test
+++ /dev/null
@@ -1,23 +0,0 @@
-# file      : tests/eval/value.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test value part of the grammar (eval-value).
-
-.include ../common.test
-
-$* <'print (foo)' >'foo'           : value
-$* <'print ()'    >''              : value-empty
-$* <'print ((foo bar))' >'foo bar' : eval
-$* <'print (!false)'    >'true'    : not
-$* <'print (!!true)'    >'true'    : not-double
-
-: attribute
-:
-{
-  $* <'print $type([string] foo)'          >'string' : type
-  $* <'print ([uint64] 001)'               >'1'      : value
-  $* <'print $null([null])'                >'true'   : null
-  $* <'print $type([string] (foo == bar))' >'string' : eval
-  $* <'print $type([string] !true)'        >'string' : not
-}
diff --git a/tests/eval/value.testscript b/tests/eval/value.testscript
new file mode 100644
index 0000000..7cae6e2
--- /dev/null
+++ b/tests/eval/value.testscript
@@ -0,0 +1,23 @@
+# file      : tests/eval/value.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test value part of the grammar (eval-value).
+
+.include ../common.testscript
+
+$* <'print (foo)' >'foo'           : value
+$* <'print ()'    >''              : value-empty
+$* <'print ((foo bar))' >'foo bar' : eval
+$* <'print (!false)'    >'true'    : not
+$* <'print (!!true)'    >'true'    : not-double
+
+: attribute
+:
+{
+  $* <'print $type([string] foo)'          >'string' : type
+  $* <'print ([uint64] 001)'               >'1'      : value
+  $* <'print $null([null])'                >'true'   : null
+  $* <'print $type([string] (foo == bar))' >'string' : eval
+  $* <'print $type([string] !true)'        >'string' : not
+}
-- 
cgit v1.1