14 files changed, 98 insertions, 0 deletions
diff --git a/old-tests/cli/lib/libtest/build/bootstrap.build b/old-tests/cli/lib/libtest/build/bootstrap.build
new file mode 100644
index 0000000..2e04406
--- /dev/null
+++ b/old-tests/cli/lib/libtest/build/bootstrap.build
@@ -0,0 +1,3 @@
+project = cli-lib-libtest
+amalgamation = # Disabled.
+using config
diff --git a/old-tests/cli/lib/libtest/build/export.build b/old-tests/cli/lib/libtest/build/export.build
new file mode 100644
index 0000000..e8b12b3
--- /dev/null
+++ b/old-tests/cli/lib/libtest/build/export.build
@@ -0,0 +1,6 @@
+$out_root/:
+{
+  include test/
+}
+
+export $out_root/test/lib{test}
diff --git a/old-tests/cli/lib/libtest/build/root.build b/old-tests/cli/lib/libtest/build/root.build
new file mode 100644
index 0000000..c9ff67d
--- /dev/null
+++ b/old-tests/cli/lib/libtest/build/root.build
@@ -0,0 +1,5 @@
+using cxx
+
+hxx{*}: extension =
+ixx{*}: extension = ipp
+cxx{*}: extension = cpp
diff --git a/old-tests/cli/lib/libtest/buildfile b/old-tests/cli/lib/libtest/buildfile
new file mode 100644
index 0000000..7ea849d
--- /dev/null
+++ b/old-tests/cli/lib/libtest/buildfile
@@ -0,0 +1,2 @@
+./: test/
+include test/
diff --git a/old-tests/cli/lib/libtest/test/base.cli b/old-tests/cli/lib/libtest/test/base.cli
new file mode 100644
index 0000000..bbf9999
--- /dev/null
+++ b/old-tests/cli/lib/libtest/test/base.cli
@@ -0,0 +1,7 @@
+namespace test
+{
+  class base
+  {
+    bool --version;
+  };
+}
diff --git a/old-tests/cli/lib/libtest/test/buildfile b/old-tests/cli/lib/libtest/test/buildfile
new file mode 100644
index 0000000..6b0d9bd
--- /dev/null
+++ b/old-tests/cli/lib/libtest/test/buildfile
@@ -0,0 +1,20 @@
+using cli
+
+lib{test}: cxx{utility} cli.cxx{test base} extra/cxx{test}
+cli.cxx{test}: cli{test}
+cli.cxx{base}: cli{base}
+
+cli.options += -I $src_root --include-with-brackets
+
+extra/:
+{
+  cxx{test} hxx{test}: cli{test}
+  cli.options += --include-prefix test/extra --guard-prefix TEST_EXTRA \
+    --cli-namespace test::extra::cli
+}
+
+cxx.poptions += -I$out_root -I$src_root
+lib{test}: cxx.export.poptions = -I$out_root -I$src_root
+
+cli.options += --include-prefix test --guard-prefix TEST \
+--cli-namespace test::cli
diff --git a/old-tests/cli/lib/libtest/test/extra/test.cli b/old-tests/cli/lib/libtest/test/extra/test.cli
new file mode 100644
index 0000000..8408402
--- /dev/null
+++ b/old-tests/cli/lib/libtest/test/extra/test.cli
@@ -0,0 +1,11 @@
+namespace test
+{
+  namespace extra
+  {
+    class options
+    {
+      bool --help;
+      bool --version;
+    };
+  }
+}
diff --git a/old-tests/cli/lib/libtest/test/test.cli b/old-tests/cli/lib/libtest/test/test.cli
new file mode 100644
index 0000000..f19d56c
--- /dev/null
+++ b/old-tests/cli/lib/libtest/test/test.cli
@@ -0,0 +1,9 @@
+include <test/base.cli>;
+
+namespace test
+{
+  class options: base
+  {
+    bool --help;
+  };
+}
diff --git a/old-tests/cli/lib/libtest/test/utility.cpp b/old-tests/cli/lib/libtest/test/utility.cpp
new file mode 100644
index 0000000..7c59218
--- /dev/null
+++ b/old-tests/cli/lib/libtest/test/utility.cpp
@@ -0,0 +1,6 @@
+#include <test/test>
+
+void
+f ()
+{
+}
diff --git a/old-tests/cli/lib/test/build/bootstrap.build b/old-tests/cli/lib/test/build/bootstrap.build
new file mode 100644
index 0000000..db43826
--- /dev/null
+++ b/old-tests/cli/lib/test/build/bootstrap.build
@@ -0,0 +1,3 @@
+project = cli-lib-test
+amalgamation = # Disabled.
+using config
diff --git a/old-tests/cli/lib/test/build/root.build b/old-tests/cli/lib/test/build/root.build
new file mode 100644
index 0000000..636fd02
--- /dev/null
+++ b/old-tests/cli/lib/test/build/root.build
@@ -0,0 +1,7 @@
+using cxx
+
+hxx{*}: extension = h
+ixx{*}: extension = inl
+cxx{*}: extension = C
+
+using cli
diff --git a/old-tests/cli/lib/test/buildfile b/old-tests/cli/lib/test/buildfile
new file mode 100644
index 0000000..d3e784d
--- /dev/null
+++ b/old-tests/cli/lib/test/buildfile
@@ -0,0 +1,6 @@
+import libs += cli-lib-libtest%lib{test}
+
+exe{driver}: cxx{driver} cli.cxx{test} $libs
+cli.cxx{test}: cli{test}
+
+cxx.poptions += -I$out_root
diff --git a/old-tests/cli/lib/test/driver.C b/old-tests/cli/lib/test/driver.C
new file mode 100644
index 0000000..ee2171f
--- /dev/null
+++ b/old-tests/cli/lib/test/driver.C
@@ -0,0 +1,8 @@
+#include "test.h"
+#include <test/test>
+#include <test/extra/test>
+
+int
+main ()
+{
+}
diff --git a/old-tests/cli/lib/test/test.cli b/old-tests/cli/lib/test/test.cli
new file mode 100644
index 0000000..db3cfb8
--- /dev/null
+++ b/old-tests/cli/lib/test/test.cli
@@ -0,0 +1,5 @@
+class options
+{
+  bool --help;
+  bool --version;
+};