Pull request #3738: memory: fix unit test build w/o reg test

Merge in SNORT/snort3 from ~RUCOMBS/snort3:mem_test to master

Squashed commit of the following:

commit 7d7cf735582105210f4d51918b0f83dfadec99cf
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Jan 19 00:04:03 2023 -0500

    memory: fix unit test build w/o reg test

diff --git a/src/memory/memory_cap.cc b/src/memory/memory_cap.cc
index d3fcf37e80d1a0175ec3e717b35b44f924d33f4a..368e201e29c3cc5a3a631733784db4a06258fcad 100644 (file)
--- a/src/memory/memory_cap.cc
+++ b/src/memory/memory_cap.cc
@@ -116,7 +116,9 @@ static void test_pkt_check()
 
     epoch_check(nullptr);
 }
+#endif
 
+#if defined(REG_TEST) || defined(UNIT_TEST)
 void MemoryCap::test_main_check()
 {
     assert(in_main_thread());

diff --git a/src/memory/memory_cap.h b/src/memory/memory_cap.h
index bf4d6f8cb310062a9e667760cecbcb86d9735ffa..f3775729f12b839fd2c9cf652c59deae23398ec2 100644 (file)
--- a/src/memory/memory_cap.h
+++ b/src/memory/memory_cap.h
@@ -76,7 +76,7 @@ public:
     // main thread - shutdown
     static void update_pegs(PegCount*);
 
-#ifdef REG_TEST
+#if defined(REG_TEST) || defined(UNIT_TEST)
     static void test_main_check();
 #endif
 };

diff --git a/src/memory/test/memory_cap_test.cc b/src/memory/test/memory_cap_test.cc
index 65de58f9470e99ae0483ac597dd9ce540e0105d9..0daeb83af00a5f613c2c6ecb6f76febad6a7631f 100644 (file)
--- a/src/memory/test/memory_cap_test.cc
+++ b/src/memory/test/memory_cap_test.cc
@@ -61,6 +61,8 @@ unsigned get_instance_id()
 
 THREAD_LOCAL const Trace* memory_trace = nullptr;
 
+void Periodic::register_handler(PeriodicHook, void*, uint16_t, uint32_t) { }
+
 //--------------------------------------------------------------------------
 // mocks
 //--------------------------------------------------------------------------