check_snmp: refactoring + fixes

This commit moves the state retention logic to check_snmp as it is only
used there and I do not want it to be used at all, so it doesn't get a
place in the lib.

Otherwise this adapts tests and fixes the rate computing in the
refactored version of check_snmp.
Also fixes some bugs detected with the tests

1 files changed, 12 insertions, 2 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f2f1777f..deae938d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -13,8 +13,14 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
 
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
 
-AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
-        @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
+AM_CPPFLAGS = -I.. \
+                          -I$(top_srcdir)/lib \
+                          -I$(top_srcdir)/gl \
+                          -I$(top_srcdir)/intl \
+                          -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
+                          @LDAPINCLUDE@ \
+                          @PGINCLUDE@ \
+                          @SSLINCLUDE@
 
 localedir = $(datadir)/locale
 # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this
@@ -42,11 +48,13 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_hpjd \
         check_procs check_mysql_query check_apt check_dbi check_curl \
         \
         tests/test_check_swap \
+        tests/test_check_snmp \
         tests/test_check_disk
 
 SUBDIRS = picohttpparser
 
 np_test_scripts = tests/test_check_swap.t \
+                                  tests/test_check_snmp.t \
                                   tests/test_check_disk.t
 
 EXTRA_DIST = t \
@@ -178,6 +186,8 @@ endif
 
 tests_test_check_swap_LDADD = $(BASEOBJS) $(tap_ldflags) -ltap
 tests_test_check_swap_SOURCES = tests/test_check_swap.c check_swap.d/swap.c
+tests_test_check_snmp_LDADD = $(BASEOBJS) $(tap_ldflags) -ltap
+tests_test_check_snmp_SOURCES = tests/test_check_snmp.c check_snmp.d/check_snmp_helpers.c
 tests_test_check_disk_LDADD = $(BASEOBJS) $(tap_ldflags) check_disk.d/utils_disk.c -ltap
 tests_test_check_disk_SOURCES = tests/test_check_disk.c