From 538b97cea63d68efbd9c9c67d9c41278cfd1ebad Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Fri, 28 Nov 2008 03:22:39 -0500 Subject: Revert inclusion of libtap into nagiosplugins (except for the NEWS file) This reverts the following commits (latest first): f3e0909, 9f16b54, be8df51, f31cd40, 5270c7d, a25083f, f1bfe40, c503d85 and 6c476db --- lib/tests/Makefile.am | 60 ++++++++++++++++++++++++++++++++----------------- lib/tests/test_all.t | 38 ------------------------------- lib/tests/test_base64.t | 6 +++++ lib/tests/test_cmd.t | 6 +++++ lib/tests/test_disk.t | 6 +++++ lib/tests/test_ini.t | 6 +++++ lib/tests/test_opts.t | 6 +++++ lib/tests/test_tcp.t | 6 +++++ lib/tests/test_utils.c | 5 ++++- lib/tests/test_utils.t | 6 +++++ 10 files changed, 85 insertions(+), 60 deletions(-) delete mode 100755 lib/tests/test_all.t create mode 100755 lib/tests/test_base64.t create mode 100644 lib/tests/test_cmd.t create mode 100755 lib/tests/test_disk.t create mode 100755 lib/tests/test_ini.t create mode 100755 lib/tests/test_opts.t create mode 100755 lib/tests/test_tcp.t create mode 100755 lib/tests/test_utils.t (limited to 'lib') diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 805acf33..25e2bed3 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 1fae81a8..00000000 --- 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 < "./$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 00000000..4b9236f0 --- /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 00000000..4dd54ef9 --- /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 00000000..d32567a9 --- /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 00000000..0487098c --- /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 00000000..d69b8f1d --- /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 00000000..8f34b67b --- /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 64efca23..5c6cce41 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 00000000..152eb718 --- /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"; -- cgit v1.2.3-74-g34f1