add cpputest

create trivial make check example for util_math

diff --git a/configure.ac b/configure.ac
index a60a2a2baef501c55c407888fbe6bab74616695f..72d61b96123f28ed2c579de8daad0bb9376a425a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -252,25 +252,25 @@ AC_CHECK_LIB(dl, dlsym, DLLIB="yes", DLLIB="no")
 AC_ARG_VAR(SIGNAL_SNORT_RELOAD, set the SIGNAL_SNORT_RELOAD value)
 
 if test "x$SIGNAL_SNORT_RELOAD" != "x" ; then
-   AC_DEFINE_UNQUOTED([SIGNAL_SNORT_RELOAD], [$SIGNAL_SNORT_RELOAD], [Set by user])
+    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_RELOAD], [$SIGNAL_SNORT_RELOAD], [Set by user])
 fi
 
 AC_ARG_VAR(SIGNAL_SNORT_DUMP_STATS, set the SIGNAL_SNORT_DUMP_STATS value)
 
 if test "x$SIGNAL_SNORT_DUMP_STATS" != "x" ; then
-   AC_DEFINE_UNQUOTED([SIGNAL_SNORT_DUMP_STATS], [$SIGNAL_SNORT_DUMP_STATS], [Set by user])
+    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_DUMP_STATS], [$SIGNAL_SNORT_DUMP_STATS], [Set by user])
 fi
 
 AC_ARG_VAR(SIGNAL_SNORT_ROTATE_STATS, set the SIGNAL_SNORT_ROTATE_STATS value)
 
 if test "x$SIGNAL_SNORT_ROTATE_STATS" != "x" ; then
-   AC_DEFINE_UNQUOTED([SIGNAL_SNORT_ROTATE_STATS], [$SIGNAL_SNORT_ROTATE_STATS], [Set by user])
+    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_ROTATE_STATS], [$SIGNAL_SNORT_ROTATE_STATS], [Set by user])
 fi
 
 AC_ARG_VAR(SIGNAL_SNORT_READ_ATTR_TBL, set the SIGNAL_SNORT_READ_ATTR_TBL value)
 
 if test "x$SIGNAL_SNORT_READ_ATTR_TBL" != "x" ; then
-   AC_DEFINE_UNQUOTED([SIGNAL_SNORT_READ_ATTR_TBL], [$SIGNAL_SNORT_READ_ATTR_TBL], [Set by user])
+    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_READ_ATTR_TBL], [$SIGNAL_SNORT_READ_ATTR_TBL], [Set by user])
 fi
 
 #--------------------------------------------------------------------------
@@ -471,6 +471,13 @@ AC_ARG_ENABLE(unit_tests,
     enable_unit_tests="$enableval", enable_unit_tests="no")
 
 if test "x$enable_unit_tests" = "xyes"; then
+    PKG_CHECK_EXISTS([cpputest], [ have_cpputest_pc="yes" ], [ have_cpputest_pc="no" ])
+
+    if test "${have_cpputest_pc}" = "yes" ; then
+        CPPFLAGS="${CPPFLAGS} `${PKG_CONFIG} --cflags cpputest`"
+        LDFLAGS="${LDFLAGS} `${PKG_CONFIG} --libs cpputest`"
+    fi
+
     AC_DEFINE(UNIT_TEST, [1], [enable unit tests in build])
 fi
 
@@ -499,7 +506,7 @@ AC_ARG_WITH(pcap_includes,
     [with_libpcap_includes="$withval"],[with_libpcap_includes="no"])
 
 if test "x$with_libpcap_includes" != "xno"; then
-   CPPFLAGS="${CPPFLAGS} -I${with_libpcap_includes}"
+    CPPFLAGS="${CPPFLAGS} -I${with_libpcap_includes}"
 fi
 
 AC_ARG_WITH(pcap_libraries,
@@ -507,7 +514,7 @@ AC_ARG_WITH(pcap_libraries,
     [with_libpcap_libraries="$withval"],[with_libpcap_libraries="no"])
 
 if test "x$with_libpcap_libraries" != "xno"; then
-   LDFLAGS="${LDFLAGS} -L${with_libpcap_libraries}"
+    LDFLAGS="${LDFLAGS} -L${with_libpcap_libraries}"
 fi
 
 LPCAP=""
@@ -600,7 +607,7 @@ AC_ARG_WITH(pcre_libraries,
     [with_libpcre_libraries="$withval"],[with_libpcre_libraries="no"])
 
 if test "x$with_libpcre_libraries" != "xno"; then
-    LDFLAGS="${LDFLAGS}  -L${with_libpcre_libraries}"
+    LDFLAGS="${LDFLAGS} -L${with_libpcre_libraries}"
 else
     LDFLAGS="${LDFLAGS} `pcre-config --libs`"
 fi
@@ -705,7 +712,7 @@ AC_ARG_WITH(daq_includes,
     [with_daq_includes="$withval"],[with_daq_includes="no"])
 
 if test "x$with_daq_includes" != "xno"; then
-   CPPFLAGS="${CPPFLAGS} -I${with_daq_includes}"
+    CPPFLAGS="${CPPFLAGS} -I${with_daq_includes}"
 fi
 
 AC_ARG_WITH(daq_libraries,
@@ -713,7 +720,7 @@ AC_ARG_WITH(daq_libraries,
     [with_daq_libraries="$withval"],[with_daq_libraries="no"])
 
 if test "x$with_daq_libraries" != "xno"; then
-   LDFLAGS="${LDFLAGS} -L${with_daq_libraries}"
+    LDFLAGS="${LDFLAGS} -L${with_daq_libraries}"
 fi
 
 AC_ARG_ENABLE(static_daq,
@@ -768,8 +775,8 @@ AC_RUN_IFELSE(
 #include <daq.h>
 ]],
 [[
-   DAQ_PktHdr_t hdr;
-   hdr.address_space_id = 0;
+    DAQ_PktHdr_t hdr;
+    hdr.address_space_id = 0;
 ]])],
 [have_daq_address_space_id="yes"],
 [have_daq_address_space_id="no"])
@@ -788,8 +795,8 @@ AC_RUN_IFELSE(
 #include <daq.h>
 ]],
 [[
-   DAQ_PktHdr_t hdr;
-   hdr.flow_id = 0;
+    DAQ_PktHdr_t hdr;
+    hdr.flow_id = 0;
 ]])],
 [have_daq_flow_id="yes"],
 [have_daq_flow_id="no"])
@@ -1014,6 +1021,7 @@ src/target_based/Makefile \
 src/test/Makefile \
 src/time/Makefile \
 src/utils/Makefile \
+src/utils/test/Makefile \
 lua/Makefile \
 doc/Makefile \
 daqs/Makefile \

diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index a6c6bba6839b1c379b8dc50a163423f865fac8e4..36b045d8602a2751f314b4d6bb3346ac8da663dd 100644 (file)
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -36,3 +36,7 @@ libutil_a_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=default
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 
+if BUILD_UNIT_TESTS
+SUBDIRS = test
+endif
+

diff --git a/src/utils/test/Makefile.am b/src/utils/test/Makefile.am
new file mode 100644 (file)
index 0000000..8b5c0db
--- /dev/null
+++ b/src/utils/test/Makefile.am
@@ -0,0 +1,10 @@
+
+AM_DEFAULT_SOURCE_EXT = .cc
+
+check_PROGRAMS = \
+util_math_test
+
+TESTS = $(check_PROGRAMS)
+
+util_math_test_LDADD = ../util_math.o
+

diff --git a/src/utils/test/util_math_test.cc b/src/utils/test/util_math_test.cc
new file mode 100644 (file)
index 0000000..d300895
--- /dev/null
+++ b/src/utils/test/util_math_test.cc
@@ -0,0 +1,28 @@
+// main.cc author Russ Combs <rucombs@cisco.com>
+// unit test main
+
+#include <CppUTest/CommandLineTestRunner.h>
+#include <CppUTest/TestHarness.h>
+
+#include "utils/util_math.h"
+
+TEST_GROUP(util_math) { };
+
+TEST(util_math, percent)
+{
+    CHECK(calc_percent(1.0, 1.0) == 100.0);
+    CHECK(calc_percent(1.0, 2.0) ==  50.0);
+    CHECK(calc_percent(1.0, 8.0) ==  12.5);
+
+    CHECK(calc_percent(1, 1) == 100.0);
+    CHECK(calc_percent(1, 2) ==  50.0);
+    CHECK(calc_percent(1, 8) ==  12.5);
+
+    CHECK(calc_percent(1, 0) ==  0);
+}
+
+int main(int argc, char** argv)
+{
+    return CommandLineTestRunner::RunAllTests(argc, argv);
+}
+

diff --git a/src/utils/util_math.cc b/src/utils/util_math.cc
index 70d72c7451e19cf686634f572d0dc8bc260fbe8b..ec205d17a583b9eb90abfde9608e7abcce97cc78 100644 (file)
--- a/src/utils/util_math.cc
+++ b/src/utils/util_math.cc
@@ -52,11 +52,3 @@ double calc_percent(double amt, double total)
     return (amt/total) * 100.0;
 }
 
-double calc_percent64(uint64_t amt, uint64_t total)
-{
-    if (total <= 0)
-        return 0.0;
-
-    return ((double)amt/total) * 100.0;
-}
-

diff --git a/src/utils/util_math.h b/src/utils/util_math.h
index 23cd640c0ab11eacbb1a05df55dc6e6fec046848..f9e9da646e0e7e1aa4a19b694a36c4435b674ef3 100644 (file)
--- a/src/utils/util_math.h
+++ b/src/utils/util_math.h
@@ -24,7 +24,6 @@
 #include "main/snort_types.h"
 
 double calc_percent(double amt, double total);
-double calc_percent64(uint64_t amt, uint64_t total);
 
 #endif