UT_ASSERTs moved to test/c_api

Author: EuphoricThinking

test/c_api/disjoint_pool.c

@@ -8,6 +8,8 @@
 #include "provider_null.h"
 #include "test_helpers.h"
 
+#include "ut_asserts.h"
+
 void test_disjoint_pool_default_params(void) {
     umf_memory_provider_handle_t provider = nullProviderCreate();
     umf_result_t retp;

test/c_api/multi_pool.c

@@ -12,6 +12,7 @@
 #include <umf/providers/provider_os_memory.h>
 
 #include "test_helpers.h"
+#include "ut_asserts.h"
 
 umf_memory_pool_handle_t
 createDisjointPool(umf_memory_provider_handle_t provider) {

test/c_api/ut_asserts.h

@@ -0,0 +1,61 @@
+#ifndef UMF_UT_ASSERTS_H
+#define UMF_UT_ASSERTS_H 1
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static inline void UT_FATAL(const char *format, ...) {
+    va_list args_list;
+    va_start(args_list, format);
+    vfprintf(stderr, format, args_list);
+    va_end(args_list);
+
+    fprintf(stderr, "\n");
+
+    abort();
+}
+
+static inline void UT_OUT(const char *format, ...) {
+    va_list args_list;
+    va_start(args_list, format);
+    vfprintf(stdout, format, args_list);
+    va_end(args_list);
+
+    fprintf(stdout, "\n");
+}
+
+// Assert a condition is true at runtime
+#define UT_ASSERT(cnd)                                                         \
+    ((void)((cnd) || (UT_FATAL("%s:%d %s - assertion failure: %s", __FILE__,   \
+                               __LINE__, __func__, #cnd),                      \
+                      0)))
+
+// Assertion with extra info printed if assertion fails at runtime
+#define UT_ASSERTinfo(cnd, info)                                               \
+    ((void)((cnd) ||                                                           \
+            (UT_FATAL("%s:%d %s - assertion failure: %s (%s = %s)", __FILE__,  \
+                      __LINE__, __func__, #cnd, #info, info),                  \
+             0)))
+
+// Assert two integer values are equal at runtime
+#define UT_ASSERTeq(lhs, rhs)                                                  \
+    ((void)(((lhs) == (rhs)) ||                                                \
+            (UT_FATAL("%s:%d %s - assertion failure: %s (0x%llx) == %s "       \
+                      "(0x%llx)",                                              \
+                      __FILE__, __LINE__, __func__, #lhs,                      \
+                      (unsigned long long)(lhs), #rhs,                         \
+                      (unsigned long long)(rhs)),                              \
+             0)))
+
+// Assert two integer values are not equal at runtime
+#define UT_ASSERTne(lhs, rhs)                                                  \
+    ((void)(((lhs) != (rhs)) ||                                                \
+            (UT_FATAL("%s:%d %s - assertion failure: %s (0x%llx) != %s "       \
+                      "(0x%llx)",                                              \
+                      __FILE__, __LINE__, __func__, #lhs,                      \
+                      (unsigned long long)(lhs), #rhs,                         \
+                      (unsigned long long)(rhs)),                              \
+             0)))
+
+#endif /* UMF_UT_ASSERTS_H */

test/common/test_helpers.h

@@ -22,59 +22,6 @@ extern "C" {
 // Needed for CI
 #define TEST_SKIP_ERROR_CODE 125
 
-static inline void UT_FATAL(const char *format, ...) {
-    va_list args_list;
-    va_start(args_list, format);
-    vfprintf(stderr, format, args_list);
-    va_end(args_list);
-
-    fprintf(stderr, "\n");
-
-    abort();
-}
-
-static inline void UT_OUT(const char *format, ...) {
-    va_list args_list;
-    va_start(args_list, format);
-    vfprintf(stdout, format, args_list);
-    va_end(args_list);
-
-    fprintf(stdout, "\n");
-}
-
-// Assert a condition is true at runtime
-#define UT_ASSERT(cnd)                                                         \
-    ((void)((cnd) || (UT_FATAL("%s:%d %s - assertion failure: %s", __FILE__,   \
-                               __LINE__, __func__, #cnd),                      \
-                      0)))
-
-// Assertion with extra info printed if assertion fails at runtime
-#define UT_ASSERTinfo(cnd, info)                                               \
-    ((void)((cnd) ||                                                           \
-            (UT_FATAL("%s:%d %s - assertion failure: %s (%s = %s)", __FILE__,  \
-                      __LINE__, __func__, #cnd, #info, info),                  \
-             0)))
-
-// Assert two integer values are equal at runtime
-#define UT_ASSERTeq(lhs, rhs)                                                  \
-    ((void)(((lhs) == (rhs)) ||                                                \
-            (UT_FATAL("%s:%d %s - assertion failure: %s (0x%llx) == %s "       \
-                      "(0x%llx)",                                              \
-                      __FILE__, __LINE__, __func__, #lhs,                      \
-                      (unsigned long long)(lhs), #rhs,                         \
-                      (unsigned long long)(rhs)),                              \
-             0)))
-
-// Assert two integer values are not equal at runtime
-#define UT_ASSERTne(lhs, rhs)                                                  \
-    ((void)(((lhs) != (rhs)) ||                                                \
-            (UT_FATAL("%s:%d %s - assertion failure: %s (0x%llx) != %s "       \
-                      "(0x%llx)",                                              \
-                      __FILE__, __LINE__, __func__, #lhs,                      \
-                      (unsigned long long)(lhs), #rhs,                         \
-                      (unsigned long long)(rhs)),                              \
-             0)))
-
 #ifndef ALIGN_UP
 #define ALIGN_UP(value, align) (((value) + (align)-1) & ~((align)-1))
 #endif