Merge pull request #795 in SNORT/snort3 from units_fix to master

Squashed commit of the following:

commit d466d48c8cb086b7f3ceebbc55c7a00a2cea821b
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Jan 30 14:27:17 2017 -0500

    fixed #defines for classes required for unit tests

diff --git a/src/service_inspectors/http_inspect/http_flow_data.h b/src/service_inspectors/http_inspect/http_flow_data.h
index 1c411af0389b17a9f9c7e24988b9023312ed1e20..d47b6f3f4f1f0feb9baac75680725db7f8116e1f 100644 (file)
--- a/src/service_inspectors/http_inspect/http_flow_data.h
+++ b/src/service_inspectors/http_inspect/http_flow_data.h
@@ -57,7 +57,7 @@ public:
     friend class HttpMsgBodyOld;
     friend class HttpStreamSplitter;
     friend class HttpTransaction;
-#ifdef REG_TEST
+#if defined(REG_TEST) || defined(UNIT_TEST)
     friend class HttpUnitTestSetup;
 #endif
 

diff --git a/src/service_inspectors/http_inspect/http_test_manager.h b/src/service_inspectors/http_inspect/http_test_manager.h
index 151dde23851e0d752a35873d12234df05f1a1e4b..e8729d98b50cacfc1e5ae219770578d36ffec149 100644 (file)
--- a/src/service_inspectors/http_inspect/http_test_manager.h
+++ b/src/service_inspectors/http_inspect/http_test_manager.h
@@ -20,7 +20,7 @@
 #ifndef HTTP_TEST_MANAGER_H
 #define HTTP_TEST_MANAGER_H
 
-#ifdef REG_TEST
+#if defined(REG_TEST) || defined(UNIT_TEST)
 
 #include <sys/types.h>
 #include <stdio.h>