Going to remove comments

Author: EuphoricThinking

test/common/test_helpers.h

@@ -58,21 +58,19 @@ static inline bool UT_LOG_ERR(const char *format, ...) {
 // Formatting is intended to resemble GTEST assertions outputs
 #define GTEST_OUT_EQ(lhs, rhs)                                                  \
     ((bool)(((lhs) == (rhs)) ||                                                \
-            (UT_LOG_ERR("%s:%d %s - assertion failure\nExpected: %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),                         \
-                      (unsigned long long)(rhs)),                              \
-             0)))
+                      (unsigned long long)(rhs))))
 
 #define GTEST_OUT_NE(lhs, rhs)                                                  \
     ((bool)(((lhs) != (rhs)) ||                                                \
-            (UT_LOG_ERR("%s:%d %s - assertion failure\nExpected: %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),                         \
-                      (unsigned long long)(rhs)),                              \
-             0)))
+                      (unsigned long long)(rhs))))
 
 // Assert a condition is true at runtime
 #define UT_ASSERT(cnd)                                                         \

test/memspaces/memspace_highest_bandwidth.cpp

@@ -12,13 +12,21 @@
 static bool canQueryBandwidth(size_t nodeId) {
     hwloc_topology_t topology = nullptr;
     int ret = hwloc_topology_init(&topology);
-    UT_ASSERTeq(ret, 0);
+    // UT_ASSERTeq(ret, 0);
+    if (!GTEST_OUT_EQ(ret, 0)){
+        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;
@@ -30,7 +38,14 @@ static bool canQueryBandwidth(size_t nodeId) {
                                   numaNode, &initiator, 0, &value);
 
     hwloc_topology_destroy(topology);
-    return (ret == 0);
+
+    if (!GTEST_OUT_EQ(ret, 0)) {
+        return false;
+    }
+    else {
+        return true;
+    }
+    //return (ret == 0);
 }
 
 INSTANTIATE_TEST_SUITE_P(memspaceLowestLatencyTest, memspaceGetTest,