12 files changed, 36 insertions, 10 deletions
diff --git a/libbuild2/build/script/lexer.test.cxx b/libbuild2/build/script/lexer.test.cxx
index 1c47442..e496f94 100644
--- a/libbuild2/build/script/lexer.test.cxx
+++ b/libbuild2/build/script/lexer.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/build/script/lexer.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -10,6 +9,9 @@
 #include <libbuild2/build/script/token.hxx>
 #include <libbuild2/build/script/lexer.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/build/script/parser.test.cxx b/libbuild2/build/script/parser.test.cxx
index da23564..4089efa 100644
--- a/libbuild2/build/script/parser.test.cxx
+++ b/libbuild2/build/script/parser.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/build/script/parser.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -16,6 +15,9 @@
 #include <libbuild2/build/script/parser.hxx>
 #include <libbuild2/build/script/runner.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/cc/lexer.test.cxx b/libbuild2/cc/lexer.test.cxx
index 284d592..0d7d12f 100644
--- a/libbuild2/cc/lexer.test.cxx
+++ b/libbuild2/cc/lexer.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/cc/lexer.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -9,6 +8,9 @@
 
 #include <libbuild2/cc/lexer.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/libbuild2/cc/parser.test.cxx b/libbuild2/cc/parser.test.cxx
index 7613741..1d5930a 100644
--- a/libbuild2/cc/parser.test.cxx
+++ b/libbuild2/cc/parser.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/cc/parser.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -9,6 +8,9 @@
 
 #include <libbuild2/cc/parser.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 
diff --git a/libbuild2/function.test.cxx b/libbuild2/function.test.cxx
index c64bd0a..b09e4f7 100644
--- a/libbuild2/function.test.cxx
+++ b/libbuild2/function.test.cxx
@@ -15,6 +15,9 @@
 #include <libbuild2/file-cache.hxx>
 #include <libbuild2/diagnostics.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/lexer.test.cxx b/libbuild2/lexer.test.cxx
index 6d48885..809fcd6 100644
--- a/libbuild2/lexer.test.cxx
+++ b/libbuild2/lexer.test.cxx
@@ -2,7 +2,6 @@
 // license   : MIT; see accompanying LICENSE file
 
 #include <cstdlib> // strtoul()
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -11,6 +10,9 @@
 #include <libbuild2/token.hxx>
 #include <libbuild2/lexer.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/name.test.cxx b/libbuild2/name.test.cxx
index 979e8ab..80b830e 100644
--- a/libbuild2/name.test.cxx
+++ b/libbuild2/name.test.cxx
@@ -3,7 +3,6 @@
 
 #include <sstream>
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>   // Includes name.
@@ -11,6 +10,9 @@
 
 #include <libbuild2/diagnostics.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/scheduler.test.cxx b/libbuild2/scheduler.test.cxx
index 49d0086..b29c932 100644
--- a/libbuild2/scheduler.test.cxx
+++ b/libbuild2/scheduler.test.cxx
@@ -4,7 +4,6 @@
 #include <chrono>
 #include <thread>
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -12,6 +11,9 @@
 
 #include <libbuild2/scheduler.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/script/lexer.test.cxx b/libbuild2/script/lexer.test.cxx
index b8de241..1516850 100644
--- a/libbuild2/script/lexer.test.cxx
+++ b/libbuild2/script/lexer.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/script/lexer.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -10,6 +9,9 @@
 #include <libbuild2/script/token.hxx>
 #include <libbuild2/script/lexer.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/script/regex.test.cxx b/libbuild2/script/regex.test.cxx
index 36d47e1..9ec2432 100644
--- a/libbuild2/script/regex.test.cxx
+++ b/libbuild2/script/regex.test.cxx
@@ -6,6 +6,9 @@
 
 #include <libbuild2/script/regex.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace build2::script::regex;
 
diff --git a/libbuild2/test/script/lexer.test.cxx b/libbuild2/test/script/lexer.test.cxx
index 9c64616..76f102d 100644
--- a/libbuild2/test/script/lexer.test.cxx
+++ b/libbuild2/test/script/lexer.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/test/script/lexer.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -10,6 +9,9 @@
 #include <libbuild2/test/script/token.hxx>
 #include <libbuild2/test/script/lexer.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2
diff --git a/libbuild2/test/script/parser.test.cxx b/libbuild2/test/script/parser.test.cxx
index 202f368..47d56ce 100644
--- a/libbuild2/test/script/parser.test.cxx
+++ b/libbuild2/test/script/parser.test.cxx
@@ -1,7 +1,6 @@
 // file      : libbuild2/test/script/parser.test.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
 #include <iostream>
 
 #include <libbuild2/types.hxx>
@@ -18,6 +17,9 @@
 #include <libbuild2/test/script/parser.hxx>
 #include <libbuild2/test/script/runner.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 namespace build2