From 7a4fc37f264cdb67f2f83fa92703c869215bbc86 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 24 Sep 2021 13:32:30 +0300
Subject: Fortify tests against NDEBUG

---
 tests/b-info/driver.cxx              | 5 +++--
 tests/backtrace/driver.cxx           | 5 +++--
 tests/base64/driver.cxx              | 5 +++--
 tests/builtin/driver.cxx             | 5 +++--
 tests/command/driver.cxx             | 5 +++--
 tests/cpfile/driver.cxx              | 5 +++--
 tests/curl/driver.cxx                | 5 +++--
 tests/default-options/driver.cxx     | 5 +++--
 tests/dir-iterator/driver.cxx        | 5 +++--
 tests/entry-time/driver.cxx          | 5 +++--
 tests/fdstream/driver.cxx            | 5 +++--
 tests/link/driver.cxx                | 5 +++--
 tests/lz4/driver.cxx                 | 3 +++
 tests/manifest-parser/driver.cxx     | 5 +++--
 tests/manifest-rewriter/driver.cxx   | 5 +++--
 tests/manifest-roundtrip/driver.cxx  | 5 +++--
 tests/manifest-serializer/driver.cxx | 5 +++--
 tests/mventry/driver.cxx             | 5 +++--
 tests/openssl/driver.cxx             | 5 +++--
 tests/optional/driver.cxx            | 5 +++--
 tests/pager/driver.cxx               | 5 +++--
 tests/path-entry/driver.cxx          | 5 +++--
 tests/path/driver.cxx                | 5 +++--
 tests/prefix-map/driver.cxx          | 5 +++--
 tests/process-run/driver.cxx         | 5 +++--
 tests/process-term/driver.cxx        | 5 +++--
 tests/process/driver.cxx             | 5 +++--
 tests/progress/driver.cxx            | 5 +++--
 tests/project-name/driver.cxx        | 5 +++--
 tests/regex/driver.cxx               | 5 +++--
 tests/semantic-version/driver.cxx    | 5 +++--
 tests/sendmail/driver.cxx            | 5 +++--
 tests/sha1/driver.cxx                | 5 +++--
 tests/sha256/driver.cxx              | 5 +++--
 tests/small-forward-list/driver.cxx  | 5 +++--
 tests/small-list/driver.cxx          | 5 +++--
 tests/small-vector/driver.cxx        | 5 +++--
 tests/standard-version/driver.cxx    | 5 +++--
 tests/strcase/driver.cxx             | 5 +++--
 tests/string-parser/driver.cxx       | 5 +++--
 tests/tab-parser/driver.cxx          | 5 +++--
 tests/target-triplet/driver.cxx      | 5 +++--
 tests/timestamp/driver.cxx           | 5 +++--
 tests/url/driver.cxx                 | 5 +++--
 tests/utf8/driver.cxx                | 5 +++--
 tests/uuid/driver.cxx                | 4 +++-
 tests/wildcard/driver.cxx            | 5 +++--
 47 files changed, 141 insertions(+), 91 deletions(-)

diff --git a/tests/b-info/driver.cxx b/tests/b-info/driver.cxx
index c5a2013..963d4e3 100644
--- a/tests/b-info/driver.cxx
+++ b/tests/b-info/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/b-info/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -24,6 +22,9 @@ import butl.utility;    // operator<<(ostream,exception)
 #include <libbutl/utility.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/backtrace/driver.cxx b/tests/backtrace/driver.cxx
index d998942..a8ae99a 100644
--- a/tests/backtrace/driver.cxx
+++ b/tests/backtrace/driver.cxx
@@ -5,8 +5,6 @@
 #  include <sys/resource.h> // setrlimit()
 #endif
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -31,6 +29,9 @@ import butl.backtrace;
 #include <libbutl/backtrace.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx
index c7906f5..d6a95b3 100644
--- a/tests/base64/driver.cxx
+++ b/tests/base64/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/base64/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <vector>
@@ -21,6 +19,9 @@ import butl.base64;
 #include <libbutl/base64.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/builtin/driver.cxx b/tests/builtin/driver.cxx
index bab74aa..7a32d8e 100644
--- a/tests/builtin/driver.cxx
+++ b/tests/builtin/driver.cxx
@@ -5,8 +5,6 @@
 #  include <libbutl/win32-utility.hxx>
 #endif
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <vector>
@@ -40,6 +38,9 @@ import butl.timestamp; // to_stream(duration)
 #include <libbutl/timestamp.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/command/driver.cxx b/tests/command/driver.cxx
index 0c070ab..e2fe41a 100644
--- a/tests/command/driver.cxx
+++ b/tests/command/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/command/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <ios>
 #include <string>
@@ -34,6 +32,9 @@ import butl.optional;
 #include <libbutl/optional.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/cpfile/driver.cxx b/tests/cpfile/driver.cxx
index c613b49..8891d58 100644
--- a/tests/cpfile/driver.cxx
+++ b/tests/cpfile/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/cpfile/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <ios>
 #include <string>
@@ -25,6 +23,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/curl/driver.cxx b/tests/curl/driver.cxx
index 18ed1e6..3b0ea43 100644
--- a/tests/curl/driver.cxx
+++ b/tests/curl/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/curl/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <iostream>
 #include <system_error>
@@ -31,6 +29,9 @@ import butl.small_vector; // @@ MOD Clang should not be necessary.
 #include <libbutl/fdstream.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/default-options/driver.cxx b/tests/default-options/driver.cxx
index 17da19c..94ad189 100644
--- a/tests/default-options/driver.cxx
+++ b/tests/default-options/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/default-options/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <limits>
 #include <string>
@@ -33,6 +31,9 @@ import butl.default_options;
 #include <libbutl/default-options.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/dir-iterator/driver.cxx b/tests/dir-iterator/driver.cxx
index b73e2e2..0c19037 100644
--- a/tests/dir-iterator/driver.cxx
+++ b/tests/dir-iterator/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/dir-iterator/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <cstddef> // size_t
 #include <iostream>
@@ -26,6 +24,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/entry-time/driver.cxx b/tests/entry-time/driver.cxx
index 1e64b0d..0da7fe9 100644
--- a/tests/entry-time/driver.cxx
+++ b/tests/entry-time/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/entry-time/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <chrono>
@@ -27,6 +25,9 @@ import butl.optional;     // @@ MOD Clang should not be necessary.
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/fdstream/driver.cxx b/tests/fdstream/driver.cxx
index 2309a7a..dc657e7 100644
--- a/tests/fdstream/driver.cxx
+++ b/tests/fdstream/driver.cxx
@@ -5,8 +5,6 @@
 #  include <libbutl/win32-utility.hxx>
 #endif
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #ifndef _WIN32
 #  include <chrono>
@@ -47,6 +45,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx
index 231da4b..6b898f5 100644
--- a/tests/link/driver.cxx
+++ b/tests/link/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/link/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <set>
 #include <utility>      // pair
@@ -30,6 +28,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/lz4/driver.cxx b/tests/lz4/driver.cxx
index e2fd537..9004b56 100644
--- a/tests/lz4/driver.cxx
+++ b/tests/lz4/driver.cxx
@@ -8,6 +8,9 @@
 #include <libbutl/fdstream.mxx>
 #include <libbutl/filesystem.mxx> // entry_stat, path_entry()
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/manifest-parser/driver.cxx b/tests/manifest-parser/driver.cxx
index a34f2b7..859e275 100644
--- a/tests/manifest-parser/driver.cxx
+++ b/tests/manifest-parser/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/manifest-parser/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <vector>
 #include <string>
@@ -25,6 +23,9 @@ import butl.manifest_parser;
 #include <libbutl/manifest-parser.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace butl
diff --git a/tests/manifest-rewriter/driver.cxx b/tests/manifest-rewriter/driver.cxx
index ec73d81..d08a6c8 100644
--- a/tests/manifest-rewriter/driver.cxx
+++ b/tests/manifest-rewriter/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/manifest-rewriter/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <vector>
 #include <string>
@@ -32,6 +30,9 @@ import butl.manifest_rewriter;
 #include <libbutl/manifest-rewriter.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace butl
diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx
index 53b688e..d0bcab9 100644
--- a/tests/manifest-roundtrip/driver.cxx
+++ b/tests/manifest-roundtrip/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/manifest-roundtrip/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -26,6 +24,9 @@ import butl.manifest_serializer;
 #include <libbutl/manifest-serializer.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx
index c818b4a..59b8ddd 100644
--- a/tests/manifest-serializer/driver.cxx
+++ b/tests/manifest-serializer/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/manifest-serializer/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <vector>
 #include <string>
@@ -23,6 +21,9 @@ import butl.manifest_serializer;
 #include <libbutl/manifest-serializer.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/mventry/driver.cxx b/tests/mventry/driver.cxx
index cb1c348..dc2e2f7 100644
--- a/tests/mventry/driver.cxx
+++ b/tests/mventry/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/mventry/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <iostream>
 #include <system_error>
@@ -24,6 +22,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/openssl/driver.cxx b/tests/openssl/driver.cxx
index d245a3a..450a547 100644
--- a/tests/openssl/driver.cxx
+++ b/tests/openssl/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/openssl/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <vector>
 #include <iostream>
@@ -32,6 +30,9 @@ import butl.small_vector; // @@ MOD Clang should not be necessary.
 #include <libbutl/fdstream.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/optional/driver.cxx b/tests/optional/driver.cxx
index 5d72f08..e73f03e 100644
--- a/tests/optional/driver.cxx
+++ b/tests/optional/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/optional/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <vector>
 #include <utility>    // move()
@@ -19,6 +17,9 @@ import butl.optional;
 #include <libbutl/optional.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 struct move_only
diff --git a/tests/pager/driver.cxx b/tests/pager/driver.cxx
index ca3c3b9..0d6e1e6 100644
--- a/tests/pager/driver.cxx
+++ b/tests/pager/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/pager/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <ios>      // ios_base::failure
 #include <vector>
@@ -24,6 +22,9 @@ import butl.pager;
 #include <libbutl/pager.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/path-entry/driver.cxx b/tests/path-entry/driver.cxx
index 30aae92..13914cd 100644
--- a/tests/path-entry/driver.cxx
+++ b/tests/path-entry/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/path-entry/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -32,6 +30,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/path/driver.cxx b/tests/path/driver.cxx
index b855e34..9f85d6b 100644
--- a/tests/path/driver.cxx
+++ b/tests/path/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/path/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <sstream>
 #include <iostream>
@@ -23,6 +21,9 @@ import butl.path;
 //#include <libbutl/path-io.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/prefix-map/driver.cxx b/tests/prefix-map/driver.cxx
index e0da9ea..0628abf 100644
--- a/tests/prefix-map/driver.cxx
+++ b/tests/prefix-map/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/prefix-map/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -20,6 +18,9 @@ import butl.prefix_map;
 #include <libbutl/prefix-map.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/process-run/driver.cxx b/tests/process-run/driver.cxx
index 94b6e00..c851666 100644
--- a/tests/process-run/driver.cxx
+++ b/tests/process-run/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/process-run/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -27,6 +25,9 @@ import butl.small_vector;
 #include <libbutl/small-vector.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/process-term/driver.cxx b/tests/process-term/driver.cxx
index 835272f..90afc96 100644
--- a/tests/process-term/driver.cxx
+++ b/tests/process-term/driver.cxx
@@ -10,8 +10,6 @@
 #  include <libbutl/win32-utility.hxx>
 #endif
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <cerrno>   // ERANGE
@@ -41,6 +39,9 @@ import butl.fdstream;
 #include <libbutl/fdstream.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/process/driver.cxx b/tests/process/driver.cxx
index b018ac1..ab5006a 100644
--- a/tests/process/driver.cxx
+++ b/tests/process/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/process/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <ios>
 #include <string>
@@ -37,6 +35,9 @@ import butl.timestamp;
 #include <libbutl/timestamp.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/progress/driver.cxx b/tests/progress/driver.cxx
index 2a0b647..68952a7 100644
--- a/tests/progress/driver.cxx
+++ b/tests/progress/driver.cxx
@@ -8,8 +8,6 @@
 #  include <io.h> //_write()
 #endif
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <cstddef>  // size_t
@@ -41,6 +39,9 @@ import butl.small_vector; // @@ MOD Clang should not be necessary.
 #include <libbutl/diagnostics.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/project-name/driver.cxx b/tests/project-name/driver.cxx
index 02b3ae3..8c5b206 100644
--- a/tests/project-name/driver.cxx
+++ b/tests/project-name/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/project-name/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <ios>       // ios::*bit
 #include <string>
@@ -24,6 +22,9 @@ import butl.project_name;
 #include <libbutl/project-name.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/regex/driver.cxx b/tests/regex/driver.cxx
index cb59cd8..ce707b8 100644
--- a/tests/regex/driver.cxx
+++ b/tests/regex/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/regex/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <regex>
 #include <string>
@@ -27,6 +25,9 @@ import butl.utility; // operator<<(ostream, exception)
 #include <libbutl/utility.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/semantic-version/driver.cxx b/tests/semantic-version/driver.cxx
index 032cb14..ac6bf33 100644
--- a/tests/semantic-version/driver.cxx
+++ b/tests/semantic-version/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/semantic-version/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <iostream>
 #endif
@@ -19,6 +17,9 @@ import butl.semantic_version;
 #include <libbutl/semantic-version.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/sendmail/driver.cxx b/tests/sendmail/driver.cxx
index e73940b..a29650c 100644
--- a/tests/sendmail/driver.cxx
+++ b/tests/sendmail/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/sendmail/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <iostream>
 #include <system_error>
@@ -30,6 +28,9 @@ import butl.small_vector; // @@ MOD Clang should not be necessary.
 #include <libbutl/sendmail.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/sha1/driver.cxx b/tests/sha1/driver.cxx
index 2b58113..cb648db 100644
--- a/tests/sha1/driver.cxx
+++ b/tests/sha1/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/sha1/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <cstddef> // size_t
@@ -25,6 +23,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx> // auto_rmfile
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/sha256/driver.cxx b/tests/sha256/driver.cxx
index 2946755..3d2f69e 100644
--- a/tests/sha256/driver.cxx
+++ b/tests/sha256/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/sha256/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <cstddef> // size_t
@@ -25,6 +23,9 @@ import butl.filesystem;
 #include <libbutl/filesystem.mxx> // auto_rmfile
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/small-forward-list/driver.cxx b/tests/small-forward-list/driver.cxx
index 670fff1..1b8a14f 100644
--- a/tests/small-forward-list/driver.cxx
+++ b/tests/small-forward-list/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/small-forward-list/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -20,6 +18,9 @@ import butl.small_forward_list;
 #include <libbutl/small-forward-list.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/small-list/driver.cxx b/tests/small-list/driver.cxx
index 9674402..cced91d 100644
--- a/tests/small-list/driver.cxx
+++ b/tests/small-list/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/small-list/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -20,6 +18,9 @@ import butl.small_list;
 #include <libbutl/small-list.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/small-vector/driver.cxx b/tests/small-vector/driver.cxx
index a8326be..be8e6d8 100644
--- a/tests/small-vector/driver.cxx
+++ b/tests/small-vector/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/small-vector/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -20,6 +18,9 @@ import butl.small_vector;
 #include <libbutl/small-vector.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx
index 4b985e1..dbd24fc 100644
--- a/tests/standard-version/driver.cxx
+++ b/tests/standard-version/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/standard-version/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <ios>       // ios::failbit, ios::badbit
 #include <string>
@@ -27,6 +25,9 @@ import butl.standard_version;
 #include <libbutl/standard-version.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/strcase/driver.cxx b/tests/strcase/driver.cxx
index f9ea3b6..48e77f2 100644
--- a/tests/strcase/driver.cxx
+++ b/tests/strcase/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/strcase/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #endif
@@ -18,6 +16,9 @@ import butl.utility;
 #include <libbutl/utility.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/string-parser/driver.cxx b/tests/string-parser/driver.cxx
index 4e4984e..2e47e4a 100644
--- a/tests/string-parser/driver.cxx
+++ b/tests/string-parser/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/string-parser/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <vector>
@@ -23,6 +21,9 @@ import butl.string_parser;
 #include <libbutl/string-parser.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl::string_parser;
 
diff --git a/tests/tab-parser/driver.cxx b/tests/tab-parser/driver.cxx
index 5a527cf..e9cd36f 100644
--- a/tests/tab-parser/driver.cxx
+++ b/tests/tab-parser/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/tab-parser/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -22,6 +20,9 @@ import butl.tab_parser;
 #include <libbutl/tab-parser.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/target-triplet/driver.cxx b/tests/target-triplet/driver.cxx
index bfa01fa..9cd7c2b 100644
--- a/tests/target-triplet/driver.cxx
+++ b/tests/target-triplet/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/target-triplet/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
@@ -21,6 +19,9 @@ import butl.target_triplet;
 #include <libbutl/target-triplet.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx
index 6283798..0ea2b38 100644
--- a/tests/timestamp/driver.cxx
+++ b/tests/timestamp/driver.cxx
@@ -3,8 +3,6 @@
 
 #include <time.h> // tzset() (POSIX), _tzset() (Windows)
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <chrono>
 #include <locale>
@@ -26,6 +24,9 @@ import butl.timestamp;
 #include <libbutl/timestamp.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/url/driver.cxx b/tests/url/driver.cxx
index 95be244..02bb5b8 100644
--- a/tests/url/driver.cxx
+++ b/tests/url/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/url/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #include <utility>   // move()
@@ -25,6 +23,9 @@ import butl.utility; // operator<<(ostream, exception)
 #include <libbutl/utility.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/utf8/driver.cxx b/tests/utf8/driver.cxx
index f35e65e..db98aa6 100644
--- a/tests/utf8/driver.cxx
+++ b/tests/utf8/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/utf8/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <string>
 #endif
@@ -20,6 +18,9 @@ import butl.utility;
 #include <libbutl/utility.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/uuid/driver.cxx b/tests/uuid/driver.cxx
index d8dae23..63e5bc7 100644
--- a/tests/uuid/driver.cxx
+++ b/tests/uuid/driver.cxx
@@ -5,13 +5,15 @@
 #  include <rpc.h> // GUID
 #endif
 
-#include <cassert>
 #include <sstream>
 #include <iostream>
 
 #include <libbutl/uuid.hxx>
 #include <libbutl/uuid-io.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx
index 00a317a..bd6a00d 100644
--- a/tests/wildcard/driver.cxx
+++ b/tests/wildcard/driver.cxx
@@ -1,8 +1,6 @@
 // file      : tests/wildcard/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
 #ifndef __cpp_lib_modules_ts
 #include <map>
 #include <string>
@@ -32,6 +30,9 @@ import butl.path_pattern;
 #include <libbutl/path-pattern.mxx>
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
-- 
cgit v1.1