Merge pull request #2128 in SNORT/snort3 from ~MASHASAN/snort3:wrap_enable_shell...

Squashed commit of the following:

commit 9ccb24f001e6699d02a40b5198108773f3a5dcb1
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Apr 3 07:18:43 2020 -0400

    control: Disable request unit-test in cmake if shell is disabled

diff --git a/src/main/test/CMakeLists.txt b/src/main/test/CMakeLists.txt
index 4c11cd6fa27f7add07db55b8399ee63dd7641728..fe5aff786a83ead7dcd2fc0acc937b62ae24c88b 100644 (file)
--- a/src/main/test/CMakeLists.txt
+++ b/src/main/test/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_cpputest(request_test
-    SOURCES
-        ../request.cc
-)
+if ( ENABLE_SHELL )
+    add_cpputest(request_test
+        SOURCES
+            ../request.cc
+    )
+endif ( ENABLE_SHELL )

diff --git a/src/main/test/request_test.cc b/src/main/test/request_test.cc
index faaf5f9adfdc6a6007c7f7dcb9167d97c4bea8ad..119472b60d603efef5a7ef618be8547472992c7c 100644 (file)
--- a/src/main/test/request_test.cc
+++ b/src/main/test/request_test.cc
@@ -45,7 +45,6 @@ TEST_GROUP(request_tests)
 //--------------------------------------------------------------------------
 // Make sure multiple responses are queued
 //--------------------------------------------------------------------------
-#ifdef SHELL
 TEST(request_tests, queued_response_test)
 {
     Request request(STDOUT_FILENO);
@@ -57,7 +56,7 @@ TEST(request_tests, queued_response_test)
     CHECK(request.send_queued_response() == true);
     CHECK(request.send_queued_response() == false); // empty queue after being written
 }
-#endif
+
 //-------------------------------------------------------------------------
 // main
 //-------------------------------------------------------------------------