UT_ASSERTs successfully substituted - going to work on return and IsSkipped

Author: EuphoricThinking

test/common/test_helpers.h

@@ -55,8 +55,7 @@ static inline bool UT_LOG_ERR(const char *format, ...) {
 
 #define GTEST_OUT_EQ(lhs, rhs)                                                  \
     ((bool)(((lhs) == (rhs)) ||                                                \
-            (UT_LOG_ERR("%s:%d %s - assertion failure\n\
-            Expected: %s == %s, actual: (0x%llx) vs (0x%llx)"     \
+            (UT_LOG_ERR("%s:%d %s - assertion failure\nExpected: %s == %s, actual: (0x%llx) vs (0x%llx)"     \
                       ,                                              \
                       __FILE__, __LINE__, __func__, #lhs,                      \
                       #rhs, (unsigned long long)(lhs),                         \

test/memspaces/memspace_lowest_latency.cpp

@@ -36,11 +36,17 @@ static bool canQueryLatency(size_t nodeId) {
         return false;
     }
     ret = hwloc_topology_load(topology);
-    UT_ASSERTeq(ret, 0);
+    //UT_ASSERTeq(ret, 0);
+    if (!(GTEST_OUT_EQ(ret, 0))) {
+        return false;
+    }
 
     hwloc_obj_t numaNode =
         hwloc_get_obj_by_type(topology, HWLOC_OBJ_NUMANODE, nodeId);
-    UT_ASSERTne(numaNode, nullptr);
+    //UT_ASSERTne(numaNode, nullptr);
+    if (!(GTEST_OUT_NE(numaNode, nullptr))) {
+        return false;
+    }
 
     // Setup initiator structure.
     struct hwloc_location initiator;