Updated link to sfsnapshotgit

[nagiosplug.git] / lib / tests / Makefile.am

diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index ba0973c9fb4fad095c9f2e5f36aadb15c9ceae59..694baf0056761fb290160bdfe00ff4bcc78c6764 100644 (file)
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -5,36 +5,34 @@ noinst_PROGRAMS = @EXTRA_TEST@
 TESTS = @EXTRA_TEST@
 check_PROGRAMS = @EXTRA_TEST@
 
-TAP_LIB_DIR = $(top_srcdir)/@TAP_DIR@/src
-TAP_O = $(TAP_LIB_DIR)/tap.o
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins -I$(TAP_LIB_DIR)
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts
+EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3
 
+np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t
 np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
-EXTRA_DIST = test_all.t $(np_test_files)
+EXTRA_DIST = $(np_test_scripts) $(np_test_files)
 
-AM_CFLAGS = -g -I..
+LIBS = @LTLIBINTL@
 
-LIBS = @LIBINTL@
+if USE_LIBTAP_LOCAL
+tap_cflags = -I$(top_srcdir)/tap
+tap_ldflags = -L$(top_srcdir)/tap
+tap_ldadd = $(top_srcdir)/gl/libgnu.a
+else
+## Shouldn't we detect that??
+tap_ldflags = -L/usr/local/lib
+endif
 
-test_utils_LDADD = ../utils_base.o $(TAP_O)
+AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
+AM_LDFLAGS = $(tap_ldflags) -ltap
+LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
 
-test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a $(TAP_O)
-
-test_tcp_LDADD = ../utils_tcp.o $(TAP_O)
-
-test_cmd_LDADD = ../utils_cmd.o ../utils_base.o $(TAP_O)
-
-test_base64_LDADD = $(top_srcdir)/gl/base64.o $(TAP_O)
-
-test_ini_LDADD = ../utils_base.o ../parse_ini.o $(TAP_O)
-
-test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o $(TAP_O)
+SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
 
 test: ${noinst_PROGRAMS}
-       perl ./test_all.t $(EXTRA_PROGRAMS)
+       perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
 
 test-debug: ${noinst_PROGRAMS}
-       perl ./test_all.t -v $(EXTRA_PROGRAMS)
+       perl -MTest::Harness -e '$$Test::Harness::verbose=1; $$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)