13 files changed, 41 insertions, 18 deletions
diff --git a/cli-tests/build/root.build b/cli-tests/build/root.build
index 5f4b348..90a319a 100644
--- a/cli-tests/build/root.build
+++ b/cli-tests/build/root.build
@@ -16,7 +16,8 @@ if ($cxx.target.system == 'win32-msvc')
 if ($cxx.class == 'msvc')
   cxx.coptions += /wd4251 /wd4275 /wd4800
 
-using cli
+if ($build.mode != 'skeleton')
+  using cli
 
 # Every exe{} in this project is by default a test.
 #
diff --git a/cli-tests/combined/driver.cxx b/cli-tests/combined/driver.cxx
index dcbdd34..3e96f0c 100644
--- a/cli-tests/combined/driver.cxx
+++ b/cli-tests/combined/driver.cxx
@@ -9,6 +9,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
diff --git a/cli-tests/combined/testscript b/cli-tests/combined/testscript
index d1f9830..f6261ab 100644
--- a/cli-tests/combined/testscript
+++ b/cli-tests/combined/testscript
@@ -3,7 +3,7 @@
 
 : values
 :
-{
+{{
   : long
   :
   $* --foo=123 >'--foo=123'
@@ -36,7 +36,7 @@
 
   : options-file
   :
-  {
+  {{
     : basics
     :
     cat <<EOI >=options;
@@ -64,12 +64,12 @@
     --foo="'bar 123'"
     EOI
     $* --file=options >"--foo='bar 123'"
-  }
-}
+  }}
+}}
 
 : flags
 :
-{
+{{
   : basic
   :
   $* -zyx >'-xyz'
@@ -105,4 +105,4 @@
   $* -xyf=123 2>>EOE != 0
   missing value for option '-f'
   EOE
-}
+}}
diff --git a/cli-tests/ctor/driver.cxx b/cli-tests/ctor/driver.cxx
index ed306f4..72c1954 100644
--- a/cli-tests/ctor/driver.cxx
+++ b/cli-tests/ctor/driver.cxx
@@ -4,6 +4,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 int
 main (int argc, char* argv[])
 {
diff --git a/cli-tests/erase/driver.cxx b/cli-tests/erase/driver.cxx
index af35836..a46df20 100644
--- a/cli-tests/erase/driver.cxx
+++ b/cli-tests/erase/driver.cxx
@@ -6,10 +6,12 @@
 //
 
 #include <string>
-#include <cassert>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
diff --git a/cli-tests/file/driver.cxx b/cli-tests/file/driver.cxx
index eef7ef1..fe923cc 100644
--- a/cli-tests/file/driver.cxx
+++ b/cli-tests/file/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
diff --git a/cli-tests/file/testscript b/cli-tests/file/testscript
index 6f83f91..658227d 100644
--- a/cli-tests/file/testscript
+++ b/cli-tests/file/testscript
@@ -284,7 +284,7 @@ EOO
 
 : relativeness
 :
-{
+{{
   +cat <<EOI >=test1.ops
     -a 11
     --file test/test.ops
@@ -335,4 +335,4 @@ EOO
     -b
     22
     EOO
-}
+}}
diff --git a/cli-tests/group/driver.cxx b/cli-tests/group/driver.cxx
index 01abf23..9a3c710 100644
--- a/cli-tests/group/driver.cxx
+++ b/cli-tests/group/driver.cxx
@@ -6,11 +6,13 @@
 //
 
 #include <string>
-#include <cassert>
 #include <iostream>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
@@ -50,7 +52,7 @@ main (int argc, char* argv[])
       s.peek ();
       assert (pos == s.position ());
 
-      const char* a;
+      const char* a (0);
       if (!sa)
       {
         a = s.next ();
diff --git a/cli-tests/inheritance/driver.cxx b/cli-tests/inheritance/driver.cxx
index 4acab0d..f0860fd 100644
--- a/cli-tests/inheritance/driver.cxx
+++ b/cli-tests/inheritance/driver.cxx
@@ -6,11 +6,13 @@
 //
 
 #include <string>
-#include <cassert>
 #include <iostream>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
diff --git a/cli-tests/manifest b/cli-tests/manifest
index 08ccb26..4f4e8f0 100644
--- a/cli-tests/manifest
+++ b/cli-tests/manifest
@@ -1,6 +1,6 @@
 : 1
 name: cli-tests
-version: 1.2.0-b.8+1
+version: 1.2.1-a.0.z
 project: cli
 summary: Tests for the CLI compiler for C++
 license: MIT
@@ -10,5 +10,5 @@ doc-url: https://www.codesynthesis.com/projects/cli/doc/guide/
 src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli-tests/
 email: cli-users@codesynthesis.com ; Mailing list
 requires: c++14
-depends: * build2 >= 0.14.0-
-depends: * bpkg >= 0.14.0-
+depends: * build2 >= 0.18.0-
+depends: * bpkg >= 0.18.0-
diff --git a/cli-tests/merge/driver.cxx b/cli-tests/merge/driver.cxx
index 43b1c59..94dc16e 100644
--- a/cli-tests/merge/driver.cxx
+++ b/cli-tests/merge/driver.cxx
@@ -6,10 +6,12 @@
 //
 
 #include <string>
-#include <cassert>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 template <typename T, int N1, int N2>
diff --git a/cli-tests/position/driver.cxx b/cli-tests/position/driver.cxx
index eebb5d0..df45f5b 100644
--- a/cli-tests/position/driver.cxx
+++ b/cli-tests/position/driver.cxx
@@ -8,6 +8,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
diff --git a/cli-tests/specifier/driver.cxx b/cli-tests/specifier/driver.cxx
index 50b9cf5..15b9695 100644
--- a/cli-tests/specifier/driver.cxx
+++ b/cli-tests/specifier/driver.cxx
@@ -6,10 +6,12 @@
 //
 
 #include <string>
-#include <cassert>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int