From 29d8b45ab24ad0db4ded32c9849a4cb6b037d44e Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 21 Dec 2025 22:55:19 -0500
Subject: [PATCH] xo-alloc2: utest: cleanup stray error messages

---
 src/alloc2/IAllocIterator_DArenaIterator.cpp |  2 +-
 utest/Collector.test.cpp                     | 12 +++++++-----
 utest/DArenaIterator.test.cpp                |  2 +-
 utest/random_allocs.cpp                      |  3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/alloc2/IAllocIterator_DArenaIterator.cpp b/src/alloc2/IAllocIterator_DArenaIterator.cpp
index dc0e1bc..e809193 100644
--- a/src/alloc2/IAllocIterator_DArenaIterator.cpp
+++ b/src/alloc2/IAllocIterator_DArenaIterator.cpp
@@ -22,7 +22,7 @@ namespace xo {
         IAllocIterator_DArenaIterator::compare(const DArenaIterator & ix,
                                                const obj<AAllocIterator> & other_arg) noexcept
         {
-            scope log(XO_DEBUG(true),
+            scope log(XO_DEBUG(false),
                       xtag("&ix", &ix),
                       xtag("ix.arena", ix.arena_), xtag("ix.pos", ix.pos_));
 
diff --git a/utest/Collector.test.cpp b/utest/Collector.test.cpp
index a54150e..119fac0 100644
--- a/utest/Collector.test.cpp
+++ b/utest/Collector.test.cpp
@@ -153,7 +153,7 @@ namespace xo {
 
         TEST_CASE("collector-x1-alloc", "[alloc2][gc]")
         {
-            scope log(XO_DEBUG(true), "DX1Collector alloc test");
+            scope log(XO_DEBUG(false), "DX1Collector alloc test");
 
             ArenaConfig arena_cfg = { .name_ = "_test_unused",
                                       .size_ = 4*1024*1024,
@@ -185,16 +185,18 @@ namespace xo {
             REQUIRE(x1alloc.data());
 
             rng::Seed<rng::xoshiro256ss> seed;
-            std::cerr << "ratio: seed=" << seed << std::endl;
+            log && log(xtag("seed", seed));
 
             auto rng = rng::xoshiro256ss(seed);
 
-            utest::AllocUtil::random_allocs(25, true, &rng, x1alloc);
+            bool catch_flag = false;
+            REQUIRE(utest::AllocUtil::random_allocs(25, catch_flag, &rng, x1alloc));
         }
 
         TEST_CASE("collector-x1-alloc2", "[alloc2][gc]")
         {
-            scope log(XO_DEBUG(true), "DX1Collector alloc test2");
+            scope log(XO_DEBUG(false),
+                      "DX1Collector alloc test2");
 
             ArenaConfig arena_cfg = { .name_ = "_test_unused",
                                       .size_ = 4*1024*1024,
@@ -233,7 +235,7 @@ namespace xo {
 
             auto rng = rng::xoshiro256ss(seed);
 
-            utest::AllocUtil::random_allocs(25, true, &rng, x1alloc);
+            REQUIRE(utest::AllocUtil::random_allocs(25, false, &rng, x1alloc));
         }
     }
 }
diff --git a/utest/DArenaIterator.test.cpp b/utest/DArenaIterator.test.cpp
index a585071..ce52675 100644
--- a/utest/DArenaIterator.test.cpp
+++ b/utest/DArenaIterator.test.cpp
@@ -152,7 +152,7 @@ namespace xo {
 
         TEST_CASE("IAllocIterator-singlearena", "[alloc2]")
         {
-            scope log(XO_DEBUG(true));
+            scope log(XO_DEBUG(false));
 
             ArenaConfig cfg { .name_              = "testarena",
                               .size_              = 64*1024,
diff --git a/utest/random_allocs.cpp b/utest/random_allocs.cpp
index e9a1d7c..56d0cb8 100644
--- a/utest/random_allocs.cpp
+++ b/utest/random_allocs.cpp
@@ -66,6 +66,7 @@ namespace utest {
             bool ok_flag = true;
 
             std::byte * mem = mm.alloc(z);
+
             log && log(xtag("i_alloc", i_alloc),
                        xtag("si", si),
                        xtag("zi", zi),
@@ -186,7 +187,7 @@ namespace utest {
                  */
                 auto alloc_map = allocs_by_lo_map;
 
-                if (log || true) {
+                if (log) {
                     log(xtag("allocs_by_lo_map.size", allocs_by_lo_map.size()));
 
                     for (auto & kv : allocs_by_lo_map) {