code cov

Author: thinks

test/src/require.h

@@ -1,3 +1,4 @@
+#include <assert.h> /* assert */
 #include <stdio.h> /* printf */
 #include <stdlib.h> /* abort */
 
@@ -19,11 +20,16 @@ static inline void
   ((bool)(expr) ? (void)0 : require_fail(#expr, __FILE__, __LINE__, TPH_PRETTY_FUNCTION))
 /* clang-format on */
 
+/* Dummy malloc/free functions. Used to set up incomplete allocators, should never be called.
+ * Having the function definitions here means that these functions don't show up as missing
+ * code coverage. */
+
 static inline void *dummy_malloc(ptrdiff_t size, void *ctx)
 {
   (void)size;
   (void)ctx;
 
+  assert(false && "called dummy_malloc");
   static int a[2];
   return (void *)a;
 }
@@ -35,4 +41,5 @@ static inline void dummy_free(void *ptr, ptrdiff_t size, void *ctx)
   (void)ctx;
 
   // Do nothing!
+  assert(false && "called dummy_free");
 }

test/src/tph_poisson_test.cpp

@@ -207,23 +207,20 @@ static void TestVaryingSeed()
   // we say that the sample from the first point set is distinct
   // from every sample in the second point set. Thus the two
   // distributions must be different.
-  auto distinct_sample_found = false;
-  for (ptrdiff_t i = 0; i < sampling_1981->nsamples; ++i) {
-    const Real *p = &samples_1981[i * sampling_1981->ndims];
-    Real min_sqr_dist = std::numeric_limits<Real>::max();
-    for (ptrdiff_t j = 0; j < sampling_1337->nsamples; ++j) {
-      const Real *q = &samples_1337[j * sampling_1337->ndims];
-      Real sqr_dist = 0;
-      for (int32_t k = 0; k < ndims; ++k) { sqr_dist += (p[k] - q[k]) * (p[k] - q[k]); }
-      min_sqr_dist = std::min(min_sqr_dist, sqr_dist);
-    }
-    if (std::sqrt(min_sqr_dist) > static_cast<Real>(0.1)) {
-      distinct_sample_found = true;
-      break;
+  REQUIRE([&]() {
+    for (ptrdiff_t i = 0; i < sampling_1981->nsamples; ++i) {
+      const Real *p = &samples_1981[i * sampling_1981->ndims];
+      Real min_sqr_dist = std::numeric_limits<Real>::max();
+      for (ptrdiff_t j = 0; j < sampling_1337->nsamples; ++j) {
+        const Real *q = &samples_1337[j * sampling_1337->ndims];
+        Real sqr_dist = 0;
+        for (int32_t k = 0; k < ndims; ++k) { sqr_dist += (p[k] - q[k]) * (p[k] - q[k]); }
+        min_sqr_dist = std::min(min_sqr_dist, sqr_dist);
+      }
+      if (std::sqrt(min_sqr_dist) > static_cast<Real>(0.1)) { return true; }
     }
-  }
-
-  REQUIRE(distinct_sample_found);
+    return false;
+  }());
 }
 
 static void TestInvalidArgs()