unittests: use a global packetpool

diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 26bacb28cc3160e08b560f5435f013b183c3b880..ede624c4f3bfd2cf49f2351f3b6788e65367507c 100644 (file)
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -1949,7 +1949,6 @@ error:
  */
 void Unified2RegisterTests(void)
 {
-  PacketPoolInit();
 #ifdef UNITTESTS
     UtRegisterTest("Unified2Test01 -- Ipv4 test", Unified2Test01, 1);
     UtRegisterTest("Unified2Test02 -- Ipv6 test", Unified2Test02, 1);

diff --git a/src/flow-manager.c b/src/flow-manager.c
index 411dcbc88cee9874e72e595a581d7db6253de096..15ad6162a0f132ce8fdd76c497c8526824bdb2ff 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -1228,10 +1228,7 @@ static int FlowMgrTest04 (void)
 static int FlowMgrTest05 (void)
 {
     int result = 0;
-    extern intmax_t max_pending_packets;
-    max_pending_packets = 128;
 
-    PacketPoolInit();
     FlowInitConfig(FLOW_QUIET);
     FlowConfig backup;
     memcpy(&backup, &flow_config, sizeof(FlowConfig));
@@ -1269,7 +1266,6 @@ static int FlowMgrTest05 (void)
 
     memcpy(&flow_config, &backup, sizeof(FlowConfig));
     FlowShutdown();
-    PacketPoolDestroy();
     return result;
 }
 #endif /* UNITTESTS */

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 93fd7f0b08534ab2cb9871c1f250e4c3dabd3108..4f3fc8bf7dc173c8e0b1cbdc109c3d4d54f36013 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -280,7 +280,13 @@ void RunUnittests(int list_unittests, char *regex_arg)
     if (list_unittests) {
         UtListTests(regex_arg);
     } else {
+        /* global packet pool */
+        extern intmax_t max_pending_packets;
+        max_pending_packets = 128;
+        PacketPoolInit();
+
         uint32_t failed = UtRunTests(regex_arg);
+        PacketPoolDestroy();
         UtCleanup();
 #ifdef __SC_CUDA_SUPPORT__
         if (PatternMatchDefaultMatcher() == MPM_AC_CUDA)