3 files changed, 18 insertions, 5 deletions
diff --git a/tests/cli/lib/libtest/test/base.cli b/tests/cli/lib/libtest/test/base.cli
new file mode 100644
index 0000000..bbf9999
--- /dev/null
+++ b/tests/cli/lib/libtest/test/base.cli
@@ -0,0 +1,7 @@
+namespace test
+{
+  class base
+  {
+    bool --version;
+  };
+}
diff --git a/tests/cli/lib/libtest/test/buildfile b/tests/cli/lib/libtest/test/buildfile
index 5325f14..61841e7 100644
--- a/tests/cli/lib/libtest/test/buildfile
+++ b/tests/cli/lib/libtest/test/buildfile
@@ -1,13 +1,18 @@
-lib{test}: cxx{utility} cxx{test} extra/cxx{test}
+lib{test}: cxx{utility} cxx{test base} extra/cxx{test}
 cxx{test} hxx{test}: cli{test}
+cxx{base} hxx{base}: cli{base}
+
+cli.options += -I $src_root --include-with-brackets
 
 extra/:
 {
   cxx{test} hxx{test}: cli{test}
-  cli.options += --cli-namespace test::extra::cli
+  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 += --cli-namespace test::cli
+cli.options += --include-prefix test --guard-prefix TEST \
+--cli-namespace test::cli
diff --git a/tests/cli/lib/libtest/test/test.cli b/tests/cli/lib/libtest/test/test.cli
index 8bc51e8..f19d56c 100644
--- a/tests/cli/lib/libtest/test/test.cli
+++ b/tests/cli/lib/libtest/test/test.cli
@@ -1,8 +1,9 @@
+include <test/base.cli>;
+
 namespace test
 {
-  class options
+  class options: base
   {
     bool --help;
-    bool --version;
   };
 }