From de1e1f4e28f486ea876754a248104b0f4eb4bdea Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 28 Sep 2015 10:08:50 +0300 Subject: [PATCH] In test-programs the ss...assert functions assert always. Now handled by defining the relevant defines. Should be fixed by replacing the use of ss_info_assert with test macros that always assert. Task for fixing this properly: https://mariadb.atlassian.net/browse/MXS-382 --- server/core/test/testbuffer.c | 7 +++++++ server/core/test/testservice.c | 7 +++++++ server/core/test/testusers.c | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/server/core/test/testbuffer.c b/server/core/test/testbuffer.c index 73d71dc27..179300be3 100644 --- a/server/core/test/testbuffer.c +++ b/server/core/test/testbuffer.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 #include #include diff --git a/server/core/test/testservice.c b/server/core/test/testservice.c index f45fd2afc..57542a64f 100644 --- a/server/core/test/testservice.c +++ b/server/core/test/testservice.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 #include #include diff --git a/server/core/test/testusers.c b/server/core/test/testusers.c index d947075a0..4385d74eb 100644 --- a/server/core/test/testusers.c +++ b/server/core/test/testusers.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 #include #include