Merge pull request #1838 in SNORT/snort3 from ~KATHARVE/snort3:h2i_ut_fix to master

Squashed commit of the following:

commit 5e2d04a800963e2eedcfe720dce7edc318e36a95
Author: Katura Harvey <katharve@cisco.com>
Date:   Fri Nov 8 10:37:30 2019 -0500

    http2_inspect: fix unit tests to build without REGTEST defined

diff --git a/src/service_inspectors/http2_inspect/test/http2_inspect_impl_test.cc b/src/service_inspectors/http2_inspect/test/http2_inspect_impl_test.cc
index 5e8fa7e6820ec751e4974f9446f7c7fdc512f764..6a9e9993af688d70866706039780ee8f9754127c 100644 (file)
--- a/src/service_inspectors/http2_inspect/test/http2_inspect_impl_test.cc
+++ b/src/service_inspectors/http2_inspect/test/http2_inspect_impl_test.cc
@@ -47,7 +47,10 @@ using namespace Http2Enums;
 unsigned HttpTestManager::test_input = IN_NONE;
 unsigned HttpTestManager::test_output = IN_NONE;
 int DetectionEngine::queue_event(unsigned int, unsigned int, Actions::Type) { return 0; }
+
+#ifdef REG_TEST
 void Field::print(FILE*, char const*) const {}
+#endif
 
 TEST_GROUP(http2_get_buf_test)
 {

diff --git a/src/service_inspectors/http2_inspect/test/http2_stream_splitter_impl_test.cc b/src/service_inspectors/http2_inspect/test/http2_stream_splitter_impl_test.cc
index a8ce23b87efe11b0bf4f5f07beb28aa41c6664d4..2e1227c479823c7ab2f7e4f560b876a192fc8b4d 100644 (file)
--- a/src/service_inspectors/http2_inspect/test/http2_stream_splitter_impl_test.cc
+++ b/src/service_inspectors/http2_inspect/test/http2_stream_splitter_impl_test.cc
@@ -49,9 +49,12 @@ unsigned HttpTestManager::test_input = IN_NONE;
 unsigned HttpTestManager::test_output = IN_NONE;
 FILE* HttpTestManager::test_out = nullptr ;
 int DetectionEngine::queue_event(unsigned int, unsigned int, Actions::Type) { return 0; }
-void Field::print(_IO_FILE*, char const*) const {}
 void Field::set(int, unsigned char const*, bool) {}
 
+#ifdef REG_TEST
+void Field::print(_IO_FILE*, char const*) const {}
+#endif
+
 TEST_GROUP(http2_scan_test)
 {
     Http2FlowDataTest* session_data = nullptr;