Merge pull request #321 in SNORT/snort3 from host_unit_test1 to master

Squashed commit of the following:

commit 254f8d9f01b11a70de9ae7766ff88d2264415944
Author: Steve Chew <stechew@cisco.com>
Date:   Mon Mar 7 17:10:34 2016 -0500

    Fixed unit test to mock another form of show_stats.

diff --git a/src/host_tracker/test/Makefile.am b/src/host_tracker/test/Makefile.am
index a0c5a01a6c053339a3dc14893898486a33fb4dd3..1d48a4c53b55989d47453ef09de5bf74cc4d615d 100644 (file)
--- a/src/host_tracker/test/Makefile.am
+++ b/src/host_tracker/test/Makefile.am
@@ -12,7 +12,7 @@ host_module_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
 host_cache_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
 host_tracker_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
 
-host_module_test_LDADD = ../host_module.o ../host_cache.o ../host_tracker.o ../../framework/libframework.a ../../catch/libcatch_tests.a ../../sfip/libsfip.a ../../utils/libutils.a  @CPPUTEST_LDFLAGS@
+host_module_test_LDADD = ../host_module.o ../host_cache.o ../host_tracker.o ../../framework/libframework.a ../../catch/libcatch_tests.a ../../sfip/libsfip.a @CPPUTEST_LDFLAGS@
 host_cache_test_LDADD = ../host_cache.o ../host_tracker.o  @CPPUTEST_LDFLAGS@
 host_tracker_test_LDADD = ../host_tracker.o @CPPUTEST_LDFLAGS@
 

diff --git a/src/host_tracker/test/host_module_test.cc b/src/host_tracker/test/host_module_test.cc
index 0d76e50dbdb3640ecd4a34678fe9af17b864dc88..125fe0f779a16e53e0fef14eaed7b8eaef9ad4c9 100644 (file)
--- a/src/host_tracker/test/host_module_test.cc
+++ b/src/host_tracker/test/host_module_test.cc
@@ -43,6 +43,10 @@ void show_stats(
 {
 }
 
+void show_stats( PegCount* , const PegInfo* , IndexVec& , const char* )
+{
+}
+
 #define FRAG_POLICY 33
 #define STREAM_POLICY 100