For a future branch

Author: EuphoricThinking

test/common/test_helpers.h

@@ -42,6 +42,20 @@ static inline void UT_OUT(const char *format, ...) {
     fprintf(stdout, "\n");
 }
 
+static inline bool UT_LOG_ERR(const char *format, ...) {
+    va_list args_list;
+    va_start(args_list, format);
+    vfprintf(stderr, format, args_list);
+    va_end(args_list);
+
+    fprintf(stderr, "\n");
+
+    return false;
+}
+
+#define GTEST_OUT(cnd) ((bool)((cnd) || (UT_LOG_ERR("%s:%d %s - assertion failure\nExpected: %s", __FILE__,   \
+                               __LINE__, __func__, #cnd),                      \
+                      0)))
 // Assert a condition is true at runtime
 #define UT_ASSERT(cnd)                                                         \
     ((void)((cnd) || (UT_FATAL("%s:%d %s - assertion failure: %s", __FILE__,   \

test/memspaces/memspace_lowest_latency.cpp

@@ -23,11 +23,16 @@ static bool canQueryLatency(size_t nodeId) {
     int ret = hwloc_topology_init(&topology);
     // UT_ASSERTeq(ret, 0);
     // EXPECT_NE(ret, 0);
-    if (ret == 0) {
-        //ADD_FAILURE();
-    //    EXPECT_NE(ret, 0);
-        std::cerr << "stderr ret is not 0 at line: " << __LINE__ << " in file: " << __FILE__ << std::endl;
+    // if (ret == 0) {
+    //     //ADD_FAILURE();
+    // //    EXPECT_NE(ret, 0);
+    //     std::cerr << "stderr ret is not 0 at line: " << __LINE__ << " in file: " << __FILE__ << std::endl;
+    //     GTEST_OUT_EQ
 
+    //     return false;
+    // }
+    if (!(GTEST_OUT(ret != 0))) {
+        EXPECT_NE(ret, 0);
         return false;
     }
     ret = hwloc_topology_load(topology);