From 49866b5959f3d0d6ba6f52fbb6aa6b82ff059479 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 10 Nov 2015 21:19:50 +0200
Subject: [PATCH] ss_info_dassert now enabled also in release mode.

---
 server/core/test/testadminusers.c | 7 +++++++
 server/core/test/testdcb.c        | 7 +++++++
 server/core/test/testfeedback.c   | 7 +++++++
 server/core/test/testfilter.c     | 7 +++++++
 server/core/test/testgwbitmask.c  | 7 +++++++
 server/core/test/testhash.c       | 8 +++++++-
 server/core/test/testhint.c       | 7 +++++++
 server/core/test/testmemlog.c     | 7 +++++++
 server/core/test/testmodutil.c    | 7 +++++++
 server/core/test/testpoll.c       | 7 +++++++
 server/core/test/testserver.c     | 7 +++++++
 server/core/test/testsession.c    | 7 +++++++
 server/core/test/testspinlock.c   | 7 +++++++
 13 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/server/core/test/testadminusers.c b/server/core/test/testadminusers.c
index cfa9be6ba..cdc7687ef 100644
--- a/server/core/test/testadminusers.c
+++ b/server/core/test/testadminusers.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testdcb.c b/server/core/test/testdcb.c
index 9668d8a23..7e63ce134 100644
--- a/server/core/test/testdcb.c
+++ b/server/core/test/testdcb.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testfeedback.c b/server/core/test/testfeedback.c
index c1d53b9cc..17fb3cf99 100644
--- a/server/core/test/testfeedback.c
+++ b/server/core/test/testfeedback.c
@@ -28,6 +28,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #define FAILTEST(s) printf("TEST FAILED: " s "\n");return 1;
 #include <my_config.h>
 #include <mysql.h>
diff --git a/server/core/test/testfilter.c b/server/core/test/testfilter.c
index bf97d7897..1fee8557c 100644
--- a/server/core/test/testfilter.c
+++ b/server/core/test/testfilter.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testgwbitmask.c b/server/core/test/testgwbitmask.c
index 86bad1245..df446c600 100644
--- a/server/core/test/testgwbitmask.c
+++ b/server/core/test/testgwbitmask.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testhash.c b/server/core/test/testhash.c
index 60f759839..5af247989 100644
--- a/server/core/test/testhash.c
+++ b/server/core/test/testhash.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -154,7 +161,6 @@ static bool do_hashtest(
 
         ss_dfprintf(stderr, "\t\t..done\n\nTest completed successfully.\n\n");
         
-        CHK_HASHTABLE(h);
         hashtable_free(h);
         
 
diff --git a/server/core/test/testhint.c b/server/core/test/testhint.c
index 388d0f610..77c1aa4e8 100644
--- a/server/core/test/testhint.c
+++ b/server/core/test/testhint.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testmemlog.c b/server/core/test/testmemlog.c
index d1cad08ae..7d2f29e93 100644
--- a/server/core/test/testmemlog.c
+++ b/server/core/test/testmemlog.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/server/core/test/testmodutil.c b/server/core/test/testmodutil.c
index 39632ab6d..a865560e3 100644
--- a/server/core/test/testmodutil.c
+++ b/server/core/test/testmodutil.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testpoll.c b/server/core/test/testpoll.c
index 61978b4f4..40ed00f0c 100644
--- a/server/core/test/testpoll.c
+++ b/server/core/test/testpoll.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testserver.c b/server/core/test/testserver.c
index 7e00b4f0b..b82c1f2c8 100644
--- a/server/core/test/testserver.c
+++ b/server/core/test/testserver.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testsession.c b/server/core/test/testsession.c
index 4d8d4cc04..8d2dd46af 100644
--- a/server/core/test/testsession.c
+++ b/server/core/test/testsession.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/test/testspinlock.c b/server/core/test/testspinlock.c
index ed8fa7214..3f2357d4a 100644
--- a/server/core/test/testspinlock.c
+++ b/server/core/test/testspinlock.c
@@ -27,6 +27,13 @@
  * @endverbatim
  */
 
+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>