15 files changed, 92 insertions, 95 deletions

diff --git a/Makefile.am b/Makefile.am
index 7032578..a0bc561 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
-# Have to list TAP_DIR manually to get in distribution
 EXTRA_DIST = config.rpath \
         ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
         NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
         NPTest.pm contrib pkg nagios-plugins.spec \
         config_test/Makefile config_test/run_tests config_test/child_test.c \
         perlmods tools/build_perl_modules \
-        tools/tinderbox_build \
-        external/tap-1.01
+        tools/tinderbox_build
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
@@ -24,9 +22,6 @@ dist-hook:
 install-root:
         cd plugins-root && $(MAKE) $@
 
-tap:
-        cd @TAP_DIR@ && $(MAKE)
-
 test test-debug:
         cd lib && $(MAKE) $@
         if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
diff --git a/configure.in b/configure.in
index 8cae534..39cd6b7 100644
--- a/configure.in
+++ b/configure.in
@@ -156,25 +156,11 @@ AC_CHECK_HEADERS(math.h)
 AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
 AC_SUBST(MATHLIBS)
 
-dnl Add libtap for tests
-AC_ARG_ENABLE(libtap,
-  AC_HELP_STRING([--enable-libtap], 
-                [Enables configuring of libtap in external/tap/. Run "make tap" to compile (default: no)]),
-        [enable_libtap=$enableval],
-        [enable_libtap=no])
-dnl Have to define TAP_DIR so that Makefile can pull it as an extra dist
-TAP_DIR=external/tap-1.01
-AC_SUBST(TAP_DIR)
-if test "$enable_libtap" = yes; then
-        dnl Have to have AC_CONFIG_SUBDIRS as a literal
-        AC_CONFIG_SUBDIRS([external/tap-1.01])
-        dnl This is required so that TAP stuff is compiled before the libs and tests
-        dnl A make install will also install the tap library, but as this is a development tool, this should be okay
-        INCLUDE_TAP_DIR=$TAP_DIR
-        AC_SUBST(INCLUDE_TAP_DIR)
+dnl Check for libtap, to run perl-like tests
+AC_CHECK_LIB(tap, plan_tests, 
         EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
         AC_SUBST(EXTRA_TEST)
-fi
+        )
 
 dnl INI Parsing
 AC_ARG_ENABLE(extra-opts,
@@ -184,11 +170,9 @@ AC_ARG_ENABLE(extra-opts,
         [enable_extra_opts=no])
 AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
 if test "$enable_extra_opts" = "yes" ; then
+        EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
+        AC_SUBST(EXTRA_TEST)
         AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
-        if test "$enable_libtap" = yes; then
-                EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
-                AC_SUBST(EXTRA_TEST)
-        fi
 fi
 
 dnl Check for PostgreSQL libraries
diff --git a/external/README b/external/README
deleted file mode 100644
index 62a868b..0000000
--- a/external/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Changes to tap-1.01.tar.gz from http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap:
-
-Added vasprintf from gnulib (see http://jc.ngo.org.uk/trac-bin/trac.cgi/ticket/32)
-Added -UHAVE_LIBPTHREAD (see http://nagiosplugins.org/faq/libtap)
diff --git a/external/tap-1.01-nagios-plugins.tar.gz b/external/tap-1.01-nagios-plugins.tar.gz
deleted file mode 100644
index 1130ab3..0000000
--- a/external/tap-1.01-nagios-plugins.tar.gz
+++ /dev/null
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 805acf3..25e2bed 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -5,36 +5,54 @@ 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 $(TAP_LIB_DIR)/../lib/libgnu.la
-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
 
+np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts.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)
-
-AM_CFLAGS = -g -I..
+EXTRA_DIST = $(np_test_scripts) $(np_test_files)
 
 LIBS = @LIBINTL@
 
-test_utils_LDADD = ../utils_base.o $(TAP_O)
-
-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)
+test_utils_SOURCES = test_utils.c
+test_utils_CFLAGS = -g -I..
+test_utils_LDFLAGS = -L/usr/local/lib -ltap
+test_utils_LDADD = ../utils_base.o
+
+test_disk_SOURCES = test_disk.c
+test_disk_CFLAGS = -g -I..
+test_disk_LDFLAGS = -L/usr/local/lib -ltap
+test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a
+
+test_tcp_SOURCES = test_tcp.c
+test_tcp_CFLAGS = -g -I..
+test_tcp_LDFLAGS = -L/usr/local/lib -ltap
+test_tcp_LDADD = ../utils_tcp.o 
+
+test_cmd_SOURCES = test_cmd.c
+test_cmd_CFLAGS = -g -I..
+test_cmd_LDFLAGS = -L/usr/local/lib -ltap
+test_cmd_LDADD = ../utils_cmd.o ../utils_base.o
+
+test_base64_SOURCES = test_base64.c
+test_base64_CFLAGS = -g -I..
+test_base64_LDFLAGS = -L/usr/local/lib -ltap
+test_base64_LDADD = $(top_srcdir)/gl/base64.o 
+
+test_ini_SOURCES = test_ini.c
+test_ini_CFLAGS = -g -I..
+test_ini_LDFLAGS = -L/usr/local/lib -ltap
+test_ini_LDADD = ../utils_base.o ../parse_ini.o
+
+test_opts_SOURCES = test_opts.c
+test_opts_CFLAGS = -g -I..
+test_opts_LDFLAGS = -L/usr/local/lib -ltap
+test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o
 
 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)
 
diff --git a/lib/tests/test_all.t b/lib/tests/test_all.t
deleted file mode 100755
index 1fae81a..0000000
--- a/lib/tests/test_all.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-# Creates $file.t for each @ARGV
-# Then calls runtests for all these files
-
-use strict;
-use Test::Harness;
-use Getopt::Std;
-
-my $opts = {};
-getopts("v", $opts) or die "Getopt failed";
-
-$Test::Harness::verbose = $opts->{v};
-$Test::Harness::switches="";
-
-my $special_errors = {
-        test_ini  => "please enable parse-ini to test",
-        test_opts => "please enable parse-ini to test",
-};
-my $default_error = "could not compile";
-
-my @tests;
-foreach my $file (@ARGV) {
-        my $file_t = "$file.t";
-        my $error = $special_errors->{ $file } || $default_error;
-        open F, ">", $file_t or die "Cannot open $file_t for writing";
-        print F <<EOF;
-use Test::More;
-if (! -e "$file") {
-        plan skip_all => "./$file not compiled - $error";
-}
-exec "./$file";
-EOF
-        close F;
-        push @tests, $file_t;
-}
-chmod 0750, @tests;
-runtests @tests;
-unlink @tests;
diff --git a/lib/tests/test_base64.t b/lib/tests/test_base64.t
new file mode 100755
index 0000000..4b9236f
--- /dev/null
+++ b/lib/tests/test_base64.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_base64") {
+        plan skip_all => "./test_base64 not compiled - please install tap library to test";
+}
+exec "./test_base64";
diff --git a/lib/tests/test_cmd.t b/lib/tests/test_cmd.t
new file mode 100644
index 0000000..4dd54ef
--- /dev/null
+++ b/lib/tests/test_cmd.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_cmd") {
+        plan skip_all => "./test_cmd not compiled - please install tap library to test";
+}
+exec "./test_cmd";
diff --git a/lib/tests/test_disk.t b/lib/tests/test_disk.t
new file mode 100755
index 0000000..d32567a
--- /dev/null
+++ b/lib/tests/test_disk.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_disk") {
+        plan skip_all => "./test_disk not compiled - please install tap library to test";
+}
+exec "./test_disk";
diff --git a/lib/tests/test_ini.t b/lib/tests/test_ini.t
new file mode 100755
index 0000000..0487098
--- /dev/null
+++ b/lib/tests/test_ini.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_ini") {
+        plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test";
+}
+exec "./test_ini";
diff --git a/lib/tests/test_opts.t b/lib/tests/test_opts.t
new file mode 100755
index 0000000..d69b8f1
--- /dev/null
+++ b/lib/tests/test_opts.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_opts") {
+        plan skip_all => "./test_opts not compiled - please install tap library and/or enable parse-ini to test";
+}
+exec "./test_opts";
diff --git a/lib/tests/test_tcp.t b/lib/tests/test_tcp.t
new file mode 100755
index 0000000..8f34b67
--- /dev/null
+++ b/lib/tests/test_tcp.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_tcp") {
+        plan skip_all => "./test_tcp not compiled - please install tap library to test";
+}
+exec "./test_tcp";
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 64efca2..5c6cce4 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -29,7 +29,7 @@ main (int argc, char **argv)
         thresholds *thresholds = NULL;
         int     rc;
 
-        plan_tests(81);
+        plan_tests(82);
 
         range = parse_range_string("6");
         ok( range != NULL, "'6' is valid range");
@@ -173,5 +173,8 @@ main (int argc, char **argv)
         ok( strcmp(test, "everything") == 0, "everything okay");
         free(test);
 
+        test = basename("/here/is/a/path");
+        ok( strcmp(test, "path") == 0, "basename okay");
+
         return exit_status();
 }
diff --git a/lib/tests/test_utils.t b/lib/tests/test_utils.t
new file mode 100755
index 0000000..152eb71
--- /dev/null
+++ b/lib/tests/test_utils.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_utils") {
+        plan skip_all => "./test_utils not compiled - please install tap library to test";
+}
+exec "./test_utils";
diff --git a/tools/setup b/tools/setup
index cdaa9c9..1afe4f1 100755
--- a/tools/setup
+++ b/tools/setup
@@ -48,6 +48,3 @@ fi
 if [ $docbook = 1 ] ; then
         ( cd doc && make )
 fi
-
-# Untar libtap
-( cd external && gunzip -c tap-1.01-nagios-plugins.tar.gz | tar -xf - )