1 files changed, 56 insertions, 6 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 49086b7a..04fb7ed2 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -27,7 +27,7 @@ MATHLIBS = @MATHLIBS@
 #AM_CFLAGS = -Wall
 
 libexec_PROGRAMS = check_apt check_cluster check_disk check_dummy check_http check_load \
-        check_mrtg check_mrtgtraf check_ntp check_ntp_peer check_nwstat check_overcr check_ping \
+        check_mrtg check_mrtgtraf check_ntp check_ntp_peer check_ping \
         check_real check_smtp check_ssh check_tcp check_time check_ntp_time \
         check_ups check_users negate \
         urlize @EXTRAS@
@@ -38,19 +38,61 @@ check_tcp_programs = check_ftp check_imap check_nntp check_pop \
 EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
         check_swap check_fping check_ldap check_game check_dig \
         check_nagios check_by_ssh check_dns check_nt check_ide_smart    \
-        check_procs check_mysql_query check_apt check_dbi check_curl
+        check_procs check_mysql_query check_apt check_dbi check_curl \
+        \
+        tests/test_check_swap \
+        tests/test_check_disk
 
 SUBDIRS = picohttpparser
 
-EXTRA_DIST = t tests
+np_test_scripts = tests/test_check_swap.t \
+                                  tests/test_check_disk.t
+
+EXTRA_DIST = t \
+                         tests \
+                         $(np_test_scripts) \
+                         negate.d \
+                         check_swap.d \
+                         check_ldap.d \
+                         check_hpjd.d \
+                         check_game.d \
+                         check_radius.d \
+                         check_disk.d \
+                         check_time.d \
+                         check_nagios.d \
+                         check_dbi.d \
+                         check_tcp.d \
+                         check_real.d \
+                         check_ssh.d \
+                         check_nt.d \
+                         check_dns.d \
+                         check_mrtgtraf.d \
+                         check_mysql_query.d \
+                         check_mrtg.d \
+                         check_ntp_peer.d \
+                         check_apt.d \
+                         check_pgsql.d \
+                         check_ping.d \
+                         check_by_ssh.d \
+                         check_smtp.d \
+                         check_mysql.d \
+                         check_ntp_time.d \
+                         check_dig.d \
+                         check_cluster.d \
+                         check_ups.d \
+                         check_fping.d
 
 PLUGINHDRS = common.h
 
 noinst_LIBRARIES = libnpcommon.a
+noinst_PROGRAMS = @EXTRA_PLUGIN_TESTS@
+# These two lines support "make check", but we use "make test"
+check_PROGRAMS = @EXTRA_PLUGIN_TESTS@
 
 libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c  \
         popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
 
+
 BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO)
 NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
@@ -58,7 +100,10 @@ SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) $(LIB_CRYPTO)
 
 TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
 
-TESTS = @PLUGIN_TEST@
+tap_ldflags = -L$(top_srcdir)/tap
+
+TESTS = @PLUGIN_TEST@ @EXTRA_PLUGIN_TESTS@
+
 
 test:
         perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
@@ -77,6 +122,7 @@ check_curl_LDADD = $(NETLIBS) $(LIBCURLLIBS) $(SSLOBJS) $(URIPARSERLIBS) picohtt
 check_dbi_LDADD = $(NETLIBS) $(DBILIBS)
 check_dig_LDADD = $(NETLIBS)
 check_disk_LDADD = $(BASEOBJS)
+check_disk_SOURCES = check_disk.c check_disk.d/utils_disk.c
 check_dns_LDADD = $(NETLIBS)
 check_dummy_LDADD = $(BASEOBJS)
 check_fping_LDADD = $(NETLIBS)
@@ -97,8 +143,6 @@ check_nagios_LDADD = $(BASEOBJS)
 check_nt_LDADD = $(NETLIBS)
 check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
-check_nwstat_LDADD = $(NETLIBS)
-check_overcr_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
 check_ping_LDADD = $(NETLIBS)
 check_procs_LDADD = $(BASEOBJS)
@@ -107,6 +151,7 @@ check_real_LDADD = $(NETLIBS)
 check_snmp_LDADD = $(BASEOBJS)
 check_smtp_LDADD = $(SSLOBJS)
 check_ssh_LDADD = $(NETLIBS)
+check_swap_SOURCES = check_swap.c check_swap.d/swap.c
 check_swap_LDADD = $(MATHLIBS) $(BASEOBJS)
 check_tcp_LDADD = $(SSLOBJS)
 check_time_LDADD = $(NETLIBS)
@@ -122,6 +167,11 @@ if !HAVE_UTMPX
 check_users_LDADD += popen.o
 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_disk_LDADD = $(BASEOBJS) $(tap_ldflags) check_disk.d/utils_disk.c -ltap
+tests_test_check_disk_SOURCES = tests/test_check_disk.c
+
 ##############################################################################
 # secondary dependencies