From 9a6dedb849edebb0fdb9332fdae4a9033e2238dc Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 19 Nov 2021 19:56:20 +0300
Subject: Fortify tests against NDEBUG

---
 cli-tests/combined/driver.cxx    | 3 +++
 cli-tests/ctor/driver.cxx        | 3 +++
 cli-tests/erase/driver.cxx       | 4 +++-
 cli-tests/file/driver.cxx        | 3 +++
 cli-tests/group/driver.cxx       | 4 +++-
 cli-tests/inheritance/driver.cxx | 4 +++-
 cli-tests/merge/driver.cxx       | 4 +++-
 cli-tests/position/driver.cxx    | 3 +++
 cli-tests/specifier/driver.cxx   | 4 +++-
 cli/cli/lexer.test.cxx           | 3 +++
 cli/cli/parser.test.cxx          | 3 +++
 11 files changed, 33 insertions(+), 5 deletions(-)

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/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/group/driver.cxx b/cli-tests/group/driver.cxx
index 01abf23..357b9a9 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
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/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
diff --git a/cli/cli/lexer.test.cxx b/cli/cli/lexer.test.cxx
index 0eb4dcb..a5cc2f3 100644
--- a/cli/cli/lexer.test.cxx
+++ b/cli/cli/lexer.test.cxx
@@ -8,6 +8,9 @@
 #include <cli/token.hxx>
 #include <cli/lexer.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 const char* keywords[] =
diff --git a/cli/cli/parser.test.cxx b/cli/cli/parser.test.cxx
index 6ef0d11..5a87bb7 100644
--- a/cli/cli/parser.test.cxx
+++ b/cli/cli/parser.test.cxx
@@ -9,6 +9,9 @@
 #include <cli/semantics.hxx>
 #include <cli/traversal.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 int
-- 
cgit v1.1