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{}

---
 unit-tests/function/buildfile         |   2 +-
 unit-tests/function/call.test         | 161 ----------------------------------
 unit-tests/function/call.testscript   | 161 ++++++++++++++++++++++++++++++++++
 unit-tests/function/syntax.test       |  29 ------
 unit-tests/function/syntax.testscript |  29 ++++++
 5 files changed, 191 insertions(+), 191 deletions(-)
 delete mode 100644 unit-tests/function/call.test
 create mode 100644 unit-tests/function/call.testscript
 delete mode 100644 unit-tests/function/syntax.test
 create mode 100644 unit-tests/function/syntax.testscript

(limited to 'unit-tests/function')

diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile
index a3eb72f..d318351 100644
--- a/unit-tests/function/buildfile
+++ b/unit-tests/function/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/function/call.test b/unit-tests/function/call.test
deleted file mode 100644
index 3dd9a85..0000000
--- a/unit-tests/function/call.test
+++ /dev/null
@@ -1,161 +0,0 @@
-# file      : unit-tests/function/call.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-: qual-implicit
-:
-$* <'print $dummy.dummy0()' >'abc'
-
-: qual-explicit
-:
-$* <'print $dummy.qual()' >'abc'
-
-: qual-fail
-:
-$* <'print $qual()' 2>>EOE != 0
-buildfile:1:8: error: unmatched call to qual()
-  info: candidate: dummy.qual()
-EOE
-
-: derived-base
-: Test derived-to-base overload resolution
-:
-$* <'print $dummy.abs([dir_path] .)'     >'false';
-$* <'print $dummy.abs([abs_dir_path] .)' >'true'
-
-: variadic
-:
-$* <'print $variadic([bool] true, foo, bar)' >'3'
-
-: fail
-:
-$* <'$fail()' 2>>EOE != 0
-error: failed
-buildfile:1:2: info: while calling fail()
-EOE
-
-: fail-invalid-arg
-:
-$* <'$fail_arg(abc)' 2>>EOE != 0
-error: invalid argument: invalid uint64 value: 'abc'
-buildfile:1:2: info: while calling fail_arg(<untyped>)
-EOE
-
-: no-match-name
-:
-$* <'$bogus()' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to bogus()
-EOE
-
-: no-match-count
-:
-$* <'$dummy0(abc)' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to dummy0(<untyped>)
-  info: candidate: dummy0(), qualified name dummy.dummy0
-EOE
-
-: no-match-type
-:
-$* <'$dummy1([uint64] 123)' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to dummy1(uint64)
-  info: candidate: dummy1(string), qualified name dummy.dummy1
-EOE
-
-: ambig
-:
-$* <'$ambig(abc)' 2>>~/EOE/ != 0
-buildfile:1:2: error: ambiguous call to ambig(<untyped>)
-/((
-  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
-  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
-/)|(
-  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
-  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
-/))
-EOE
-
-: unmatched
-:
-$* <'$ambig(abc, def)' 2>>~/EOE/ != 0
-buildfile:1:2: error: unmatched call to ambig(<untyped>, <untyped>)
-/((
-  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
-  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
-/)|(
-  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
-  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
-/))
-EOE
-
-: reverse
-:
-$* <'print $reverse([string] abc)' >'abc'
-
-: optional-absent
-:
-$* <'print $optional()' >'true'
-
-: optional-present
-:
-$* <'print $optional(abc)' >'false'
-
-: null-true
-:
-$* <'print $nullable([null])' >'true'
-
-: null-false
-:
-$* <'print $nullable(nonull)' >'false'
-
-: null-fail
-:
-$* <'$dummy1([string null])' 2>>EOE != 0
-error: invalid argument: null value
-buildfile:1:2: info: while calling dummy1(string)
-EOE
-
-: print-call-1-untyped
-:
-$* <'$bogus(abc)' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to bogus(<untyped>)
-EOE
-
-: print-call-1-typed
-:
-$* <'$bogus([uint64] 123)' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to bogus(uint64)
-EOE
-
-: print-call-2
-:
-$* <'$bogus(abc, [uint64] 123)' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to bogus(<untyped>, uint64)
-EOE
-
-: print-fovl
-:
-$* <'$ambig([bool] true)' 2>>~/EOE/ != 0
-buildfile:1:2: error: ambiguous call to ambig(bool)
-/((
-  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
-  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
-/)|(
-  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
-  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
-/))
-EOE
-
-: print-fovl-variadic
-:
-$* <'$variadic(abc)' 2>>EOE != 0
-buildfile:1:2: error: unmatched call to variadic(<untyped>)
-  info: candidate: variadic(bool [, ...])
-EOE
-
-: member-function
-:
-$* <'print $dummy.length([path] abc)' >'3'
-
-: data-member
-:
-$* <'print $dummy.type([name] cxx{foo})' >'cxx'
diff --git a/unit-tests/function/call.testscript b/unit-tests/function/call.testscript
new file mode 100644
index 0000000..4bc5897
--- /dev/null
+++ b/unit-tests/function/call.testscript
@@ -0,0 +1,161 @@
+# file      : unit-tests/function/call.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+: qual-implicit
+:
+$* <'print $dummy.dummy0()' >'abc'
+
+: qual-explicit
+:
+$* <'print $dummy.qual()' >'abc'
+
+: qual-fail
+:
+$* <'print $qual()' 2>>EOE != 0
+buildfile:1:8: error: unmatched call to qual()
+  info: candidate: dummy.qual()
+EOE
+
+: derived-base
+: Test derived-to-base overload resolution
+:
+$* <'print $dummy.abs([dir_path] .)'     >'false';
+$* <'print $dummy.abs([abs_dir_path] .)' >'true'
+
+: variadic
+:
+$* <'print $variadic([bool] true, foo, bar)' >'3'
+
+: fail
+:
+$* <'$fail()' 2>>EOE != 0
+error: failed
+buildfile:1:2: info: while calling fail()
+EOE
+
+: fail-invalid-arg
+:
+$* <'$fail_arg(abc)' 2>>EOE != 0
+error: invalid argument: invalid uint64 value: 'abc'
+buildfile:1:2: info: while calling fail_arg(<untyped>)
+EOE
+
+: no-match-name
+:
+$* <'$bogus()' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to bogus()
+EOE
+
+: no-match-count
+:
+$* <'$dummy0(abc)' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to dummy0(<untyped>)
+  info: candidate: dummy0(), qualified name dummy.dummy0
+EOE
+
+: no-match-type
+:
+$* <'$dummy1([uint64] 123)' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to dummy1(uint64)
+  info: candidate: dummy1(string), qualified name dummy.dummy1
+EOE
+
+: ambig
+:
+$* <'$ambig(abc)' 2>>~/EOE/ != 0
+buildfile:1:2: error: ambiguous call to ambig(<untyped>)
+/((
+  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
+  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
+/)|(
+  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
+  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
+/))
+EOE
+
+: unmatched
+:
+$* <'$ambig(abc, def)' 2>>~/EOE/ != 0
+buildfile:1:2: error: unmatched call to ambig(<untyped>, <untyped>)
+/((
+  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
+  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
+/)|(
+  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
+  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
+/))
+EOE
+
+: reverse
+:
+$* <'print $reverse([string] abc)' >'abc'
+
+: optional-absent
+:
+$* <'print $optional()' >'true'
+
+: optional-present
+:
+$* <'print $optional(abc)' >'false'
+
+: null-true
+:
+$* <'print $nullable([null])' >'true'
+
+: null-false
+:
+$* <'print $nullable(nonull)' >'false'
+
+: null-fail
+:
+$* <'$dummy1([string null])' 2>>EOE != 0
+error: invalid argument: null value
+buildfile:1:2: info: while calling dummy1(string)
+EOE
+
+: print-call-1-untyped
+:
+$* <'$bogus(abc)' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to bogus(<untyped>)
+EOE
+
+: print-call-1-typed
+:
+$* <'$bogus([uint64] 123)' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to bogus(uint64)
+EOE
+
+: print-call-2
+:
+$* <'$bogus(abc, [uint64] 123)' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to bogus(<untyped>, uint64)
+EOE
+
+: print-fovl
+:
+$* <'$ambig([bool] true)' 2>>~/EOE/ != 0
+buildfile:1:2: error: ambiguous call to ambig(bool)
+/((
+  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
+  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
+/)|(
+  info: candidate: ambig(<untyped> [, string]), qualified name dummy.ambig
+  info: candidate: ambig(<untyped> [, uint64]), qualified name dummy.ambig
+/))
+EOE
+
+: print-fovl-variadic
+:
+$* <'$variadic(abc)' 2>>EOE != 0
+buildfile:1:2: error: unmatched call to variadic(<untyped>)
+  info: candidate: variadic(bool [, ...])
+EOE
+
+: member-function
+:
+$* <'print $dummy.length([path] abc)' >'3'
+
+: data-member
+:
+$* <'print $dummy.type([name] cxx{foo})' >'cxx'
diff --git a/unit-tests/function/syntax.test b/unit-tests/function/syntax.test
deleted file mode 100644
index 4620e6a..0000000
--- a/unit-tests/function/syntax.test
+++ /dev/null
@@ -1,29 +0,0 @@
-# file      : unit-tests/function/syntax.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-$* <'$dump()'           >:''                    : none
-$* <'$dump(  )'         >:''                    : none-in-spaces
-$* <'$dump("")'         >'{}'                   : one-empty
-$* <'$dump(a)'          >'a'                    : one-single
-$* <'$dump(a b c)'      >'a b c'                : one-list
-$* <'$dump(d/t{x y z})' >'d/t{x} d/t{y} d/t{z}' : one-names
-
-$* <'print a$dummy1([string] b)c'               >'abc' : concat
-$* <'print $dummy2([uint64] 123, [uint64] 321)' >'444' : multi-arg
-
-: quoting
-: Verify we can inhibit function call with quoting
-:
-$* <<EOI >>EOO
-foo = FOO
-bar = BAR
-
-print $foo"($bar)"
-print "$foo"($bar)
-print "$foo""($bar)"
-EOI
-FOOBAR
-FOOBAR
-FOOBAR
-EOO
diff --git a/unit-tests/function/syntax.testscript b/unit-tests/function/syntax.testscript
new file mode 100644
index 0000000..c9c56d3
--- /dev/null
+++ b/unit-tests/function/syntax.testscript
@@ -0,0 +1,29 @@
+# file      : unit-tests/function/syntax.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+$* <'$dump()'           >:''                    : none
+$* <'$dump(  )'         >:''                    : none-in-spaces
+$* <'$dump("")'         >'{}'                   : one-empty
+$* <'$dump(a)'          >'a'                    : one-single
+$* <'$dump(a b c)'      >'a b c'                : one-list
+$* <'$dump(d/t{x y z})' >'d/t{x} d/t{y} d/t{z}' : one-names
+
+$* <'print a$dummy1([string] b)c'               >'abc' : concat
+$* <'print $dummy2([uint64] 123, [uint64] 321)' >'444' : multi-arg
+
+: quoting
+: Verify we can inhibit function call with quoting
+:
+$* <<EOI >>EOO
+foo = FOO
+bar = BAR
+
+print $foo"($bar)"
+print "$foo"($bar)
+print "$foo""($bar)"
+EOI
+FOOBAR
+FOOBAR
+FOOBAR
+EOO
-- 
cgit v1.1