From d98e538a1b4e9eaa3b8412db59ff4a1c200f3df6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 24 Sep 2021 12:39:00 +0300
Subject: Fortify tests against NDEBUG

---
 tests/build-class-expr/driver.cxx    | 3 +++
 tests/manifest/driver.cxx            | 4 +++-
 tests/overrides/driver.cxx           | 4 +++-
 tests/package-version/driver.cxx     | 4 +++-
 tests/repository-location/driver.cxx | 4 +++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/build-class-expr/driver.cxx b/tests/build-class-expr/driver.cxx
index 2ca123a..5ff5f12 100644
--- a/tests/build-class-expr/driver.cxx
+++ b/tests/build-class-expr/driver.cxx
@@ -10,6 +10,9 @@
 
 #include <libbpkg/manifest.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 // Usages:
 //
 // argv[0] -p
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 7ea77e3..2148ebb 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -3,7 +3,6 @@
 
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <string>
-#include <cassert>
 #include <iostream>
 
 #include <libbutl/manifest-parser.mxx>
@@ -12,6 +11,9 @@
 
 #include <libbpkg/manifest.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 using namespace bpkg;
diff --git a/tests/overrides/driver.cxx b/tests/overrides/driver.cxx
index 4302bb1..f429b65 100644
--- a/tests/overrides/driver.cxx
+++ b/tests/overrides/driver.cxx
@@ -6,7 +6,6 @@
 #include <vector>
 #include <cstddef>  // size_t
 #include <cstdint>  // uint64_t
-#include <cassert>
 #include <iostream>
 
 #include <libbutl/utility.mxx>             // trim()
@@ -15,6 +14,9 @@
 
 #include <libbpkg/manifest.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 using namespace bpkg;
diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx
index 57c3f04..fc45c4d 100644
--- a/tests/package-version/driver.cxx
+++ b/tests/package-version/driver.cxx
@@ -2,7 +2,6 @@
 // license   : MIT; see accompanying LICENSE file
 
 #include <string>
-#include <cassert>
 #include <cstdint>   // uint16
 #include <iostream>
 #include <exception>
@@ -13,6 +12,9 @@
 
 #include <libbpkg/manifest.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx
index 3eb8101..b0c7039 100644
--- a/tests/repository-location/driver.cxx
+++ b/tests/repository-location/driver.cxx
@@ -2,7 +2,6 @@
 // license   : MIT; see accompanying LICENSE file
 
 #include <string>
-#include <cassert>
 #include <sstream>
 #include <iostream>
 #include <stdexcept> // invalid_argument, logic_error
@@ -12,6 +11,9 @@
 
 #include <libbpkg/manifest.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
-- 
cgit v1.1