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/cc/parser/buildfile         |   2 +-
 unit-tests/cc/parser/module.test       | 149 ---------------------------------
 unit-tests/cc/parser/module.testscript | 149 +++++++++++++++++++++++++++++++++
 3 files changed, 150 insertions(+), 150 deletions(-)
 delete mode 100644 unit-tests/cc/parser/module.test
 create mode 100644 unit-tests/cc/parser/module.testscript

(limited to 'unit-tests/cc/parser')

diff --git a/unit-tests/cc/parser/buildfile b/unit-tests/cc/parser/buildfile
index c01c1c0..fce77f4 100644
--- a/unit-tests/cc/parser/buildfile
+++ b/unit-tests/cc/parser/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/cc/parser/module.test b/unit-tests/cc/parser/module.test
deleted file mode 100644
index 65186cd..0000000
--- a/unit-tests/cc/parser/module.test
+++ /dev/null
@@ -1,149 +0,0 @@
-# file      : unit-tests/cc/parser/module.test
-# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test C++ module constructs.
-#
-
-: import
-:
-$* <<EOI >>EOI
-import foo;
-import foo.bar;
-import foo.bar.baz;
-EOI
-
-: module-implementation
-:
-$* <<EOI >>EOI
-module foo;
-EOI
-
-: module-interface
-:
-$* <<EOI >>EOI
-export module foo;
-EOI
-
-: export-imported
-:
-$* <<EOI >>EOO
-export import foo;
-EOI
-export import foo;
-EOO
-
-: export-imported-block
-:
-$* <<EOI >>EOO
-import bar;
-
-export {import foo;}
-
-export
-{
-  namespace foo
-  {
-    class c {};
-  }
-
-  template <typename T> int f ();
-
-  import bar;
-}
-EOI
-export import bar;
-export import foo;
-EOO
-
-: non-module
-:
-$* <<EOI
-#pragma import module foo;
-#pragma export module foo;
-#pragma module foo;
-extern module foo: int foo ();
-export namespace bar {int fox ();}
-EOI
-
-: attribute
-:
-$* <<EOI >>EOO
-import foo [[export({import})]];
-module bar [[module({module})]];
-EOI
-import foo;
-module bar;
-EOO
-
-: import-duplicate
-:
-$* <<EOI >>EOO
-import foo;
-import bar.baz;
-import foo;
-import bar . baz;
-EOI
-import foo;
-import bar.baz;
-EOO
-
-: brace-missing
-:
-$* <<EOI 2>>EOE != 0
-export
-{
-  class foo
-  {
-  //};
-  module foo;
-}
-EOI
-stdin:8:1: error: {}-imbalance detected
-EOE
-
-: brace-stray
-:
-$* <<EOI 2>>EOE != 0
-export
-{
-  class foo
-  {
-  };}
-}
-module foo;
-EOI
-stdin:6:1: error: {}-imbalance detected
-EOE
-
-: import-missing-name
-:
-$* <<EOI 2>>EOE != 0
-import ;
-EOI
-stdin:1:8: error: module name expected instead of ';'
-EOE
-
-: module-missing-name
-:
-$* <<EOI 2>>EOE != 0
-module ;
-EOI
-stdin:1:1: error: module declaration expected after leading module marker
-EOE
-
-: import-missing-semi
-:
-$* <<EOI 2>>EOE != 0
-import foo
-EOI
-stdin:2:1: error: ';' expected instead of <end of file>
-EOE
-
-: module-missing-semi
-:
-$* <<EOI 2>>EOE != 0
-export module foo
-EOI
-stdin:2:1: error: ';' expected instead of <end of file>
-EOE
diff --git a/unit-tests/cc/parser/module.testscript b/unit-tests/cc/parser/module.testscript
new file mode 100644
index 0000000..c6a7e31
--- /dev/null
+++ b/unit-tests/cc/parser/module.testscript
@@ -0,0 +1,149 @@
+# file      : unit-tests/cc/parser/module.testscript
+# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test C++ module constructs.
+#
+
+: import
+:
+$* <<EOI >>EOI
+import foo;
+import foo.bar;
+import foo.bar.baz;
+EOI
+
+: module-implementation
+:
+$* <<EOI >>EOI
+module foo;
+EOI
+
+: module-interface
+:
+$* <<EOI >>EOI
+export module foo;
+EOI
+
+: export-imported
+:
+$* <<EOI >>EOO
+export import foo;
+EOI
+export import foo;
+EOO
+
+: export-imported-block
+:
+$* <<EOI >>EOO
+import bar;
+
+export {import foo;}
+
+export
+{
+  namespace foo
+  {
+    class c {};
+  }
+
+  template <typename T> int f ();
+
+  import bar;
+}
+EOI
+export import bar;
+export import foo;
+EOO
+
+: non-module
+:
+$* <<EOI
+#pragma import module foo;
+#pragma export module foo;
+#pragma module foo;
+extern module foo: int foo ();
+export namespace bar {int fox ();}
+EOI
+
+: attribute
+:
+$* <<EOI >>EOO
+import foo [[export({import})]];
+module bar [[module({module})]];
+EOI
+import foo;
+module bar;
+EOO
+
+: import-duplicate
+:
+$* <<EOI >>EOO
+import foo;
+import bar.baz;
+import foo;
+import bar . baz;
+EOI
+import foo;
+import bar.baz;
+EOO
+
+: brace-missing
+:
+$* <<EOI 2>>EOE != 0
+export
+{
+  class foo
+  {
+  //};
+  module foo;
+}
+EOI
+stdin:8:1: error: {}-imbalance detected
+EOE
+
+: brace-stray
+:
+$* <<EOI 2>>EOE != 0
+export
+{
+  class foo
+  {
+  };}
+}
+module foo;
+EOI
+stdin:6:1: error: {}-imbalance detected
+EOE
+
+: import-missing-name
+:
+$* <<EOI 2>>EOE != 0
+import ;
+EOI
+stdin:1:8: error: module name expected instead of ';'
+EOE
+
+: module-missing-name
+:
+$* <<EOI 2>>EOE != 0
+module ;
+EOI
+stdin:1:1: error: module declaration expected after leading module marker
+EOE
+
+: import-missing-semi
+:
+$* <<EOI 2>>EOE != 0
+import foo
+EOI
+stdin:2:1: error: ';' expected instead of <end of file>
+EOE
+
+: module-missing-semi
+:
+$* <<EOI 2>>EOE != 0
+export module foo
+EOI
+stdin:2:1: error: ';' expected instead of <end of file>
+EOE
-- 
cgit v1.1