From: russ <russ@localhost.localdomain>
Date: Thu, 29 Oct 2015 21:28:05 +0000 (-0400)
Subject: fix make check for regex with auto tools
X-Git-Tag: 3.0.0-233~756^2~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9b68fe6e415648fb2889e69d380e7d4bbc9a1f;p=thirdparty%2Fsnort3.git

fix make check for regex with auto tools
---

diff --git a/src/flow/Makefile.am b/src/flow/Makefile.am
index 3ead53023..80cbce9f2 100644
--- a/src/flow/Makefile.am
+++ b/src/flow/Makefile.am
@@ -17,7 +17,7 @@ expect_cache.cc expect_cache.h \
 flow_control.cc flow_control.h \
 session.h
 
-libflow_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
+#libflow_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 
diff --git a/src/ips_options/test/Makefile.am b/src/ips_options/test/Makefile.am
index 6046610b4..f3a825d0d 100644
--- a/src/ips_options/test/Makefile.am
+++ b/src/ips_options/test/Makefile.am
@@ -7,8 +7,10 @@ ips_regex_test
 TESTS = $(check_PROGRAMS)
 
 ips_regex_test_LDADD = \
-../../framework/ips_option.cc \
-../../framework/module.cc \
-../../framework/value.cc \
-../../sfip/sf_ip.cc
+../ips_regex.o \
+../../catch/unit_test.o \
+../../framework/ips_option.o \
+../../framework/module.o \
+../../framework/value.o \
+../../sfip/sf_ip.o
 
diff --git a/src/ips_options/test/ips_regex_test.cc b/src/ips_options/test/ips_regex_test.cc
index 656f8e024..9a9f9616e 100644
--- a/src/ips_options/test/ips_regex_test.cc
+++ b/src/ips_options/test/ips_regex_test.cc
@@ -18,6 +18,8 @@
 
 // ips_regex_test.cc author Russ Combs <rucombs@cisco.com>
 
+#include "ips_options/ips_regex.h"
+
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 
@@ -28,6 +30,7 @@
 #include "framework/module.h"
 #include "protocols/packet.h"
 #include "detection/detection_defines.h"
+#include "main/snort_config.h"
 
 //-------------------------------------------------------------------------
 // stubs, spies, etc.
@@ -46,10 +49,25 @@ Cursor::Cursor(Packet* p)
 static unsigned s_parse_errors = 0;
 
 void ParseError(const char*, ...)
+{ s_parse_errors++; }
+
+SnortConfig s_conf;
+THREAD_LOCAL SnortConfig* snort_conf = &s_conf;
+
+static SnortState s_state;
+
+SnortConfig::SnortConfig()
 {
-    s_parse_errors++;
+    state = &s_state;
+    memset(state, 0, sizeof(*state));
+    num_slots = 1;
 }
 
+SnortConfig::~SnortConfig() { }
+
+unsigned get_instance_id()
+{ return 0; }
+
 //-------------------------------------------------------------------------
 // helpers
 //-------------------------------------------------------------------------
@@ -214,15 +232,14 @@ TEST_GROUP(ips_regex_option)
 
     void setup()
     { 
-        IpsApi* api = (IpsApi*)ips_regex;
-        opt = get_option("\\bfoo");
-        api->tinit(nullptr);
+        opt = get_option(" foo ");
+        regex_setup(snort_conf);
     }
     void teardown()
     {
         IpsApi* api = (IpsApi*)ips_regex;
         api->dtor(opt);
-        api->tterm(nullptr);
+        regex_cleanup(snort_conf);
     }
 };
 
@@ -242,7 +259,7 @@ TEST(ips_regex_option, hash)
 
 TEST(ips_regex_option, opeq)
 {
-    IpsOption* opt2 = get_option("\\bfoo");
+    IpsOption* opt2 = get_option(" foo ");
     CHECK(opt2);
     CHECK(*opt == *opt2);
     
@@ -283,15 +300,14 @@ TEST_GROUP(ips_regex_option_relative)
 
     void setup()
     { 
-        IpsApi* api = (IpsApi*)ips_regex;
         opt = get_option("\\bfoo", true);
-        api->tinit(nullptr);
+        regex_setup(snort_conf);
     }
     void teardown()
     {
         IpsApi* api = (IpsApi*)ips_regex;
         api->dtor(opt);
-        api->tterm(nullptr);
+        regex_cleanup(snort_conf);
     }
 };
 
diff --git a/src/log/Makefile.am b/src/log/Makefile.am
index 87ac3a05b..6f019b374 100644
--- a/src/log/Makefile.am
+++ b/src/log/Makefile.am
@@ -17,7 +17,7 @@ messages.cc \
 obfuscation.cc \
 text_log.cc
 
-liblog_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
+#liblog_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 
diff --git a/src/packet_io/Makefile.am b/src/packet_io/Makefile.am
index a793aaac1..de2f1d625 100644
--- a/src/packet_io/Makefile.am
+++ b/src/packet_io/Makefile.am
@@ -11,6 +11,6 @@ intf.h \
 sfdaq.h \
 trough.h
 
-libpacket_io_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
+#libpacket_io_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/src/piglet/Makefile.am b/src/piglet/Makefile.am
index 0e62a20fe..33c9a5b4c 100644
--- a/src/piglet/Makefile.am
+++ b/src/piglet/Makefile.am
@@ -14,6 +14,6 @@ piglet_runner.h \
 piglet_utils.cc \
 piglet_utils.h
 
-libpiglet_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
+#libpiglet_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/src/sfip/Makefile.am b/src/sfip/Makefile.am
index a1994ae57..30314984c 100644
--- a/src/sfip/Makefile.am
+++ b/src/sfip/Makefile.am
@@ -19,7 +19,7 @@ if BUILD_UNIT_TESTS
 libsfip_a_SOURCES += sfip_test.cc
 endif
 
-libsfip_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
+#libsfip_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 
diff --git a/src/sfrt/Makefile.am b/src/sfrt/Makefile.am
index b054bf174..8677cc773 100644
--- a/src/sfrt/Makefile.am
+++ b/src/sfrt/Makefile.am
@@ -20,7 +20,7 @@ if BUILD_UNIT_TESTS
 libsfrt_a_SOURCES += sfrt_test.cc
 endif
 
-libsfrt_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
+#libsfrt_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@