1 files changed, 18 insertions, 3 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 49086b7a..d43c1971 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -38,19 +38,27 @@ 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
 
 SUBDIRS = picohttpparser
 
-EXTRA_DIST = t tests
+np_test_scripts = tests/test_check_swap.t
+
+EXTRA_DIST = t tests $(np_test_scripts) check_swap.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 +66,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
@@ -107,6 +118,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 +134,9 @@ 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
+
 ##############################################################################
 # secondary dependencies