8 files changed, 22 insertions, 10 deletions

diff --git a/Makefile.am b/Makefile.am
index 701c56cc..416ef62b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,11 +22,11 @@ dist-hook:
 install-root:
         cd plugins-root && $(MAKE) $@
 
-test:
-        cd lib && $(MAKE) test
-        if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi
-        cd plugins && $(MAKE) test
-        cd plugins-scripts && $(MAKE) test
+test test-debug:
+        cd lib && $(MAKE) $@
+        if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
+        cd plugins && $(MAKE) $@
+        cd plugins-scripts && $(MAKE) $@
 
 nagios-plugins.spec: nagios-plugins.spec.in
         sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
diff --git a/NEWS b/NEWS
index a481b58a..b08bd02a 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ This file documents the major additions and syntax changes between releases.
         Fix check_disk reporting OK if disk usage grows over 100% (bug #1348746).
           The problem happens to be in Gnulib but a workaround have been implemented in check_disk.c
         Fix check_load argument handling when not passing triplets (bug #1831890)
+        Tinderbox builds now run tests in a verbose mode
 
 1.4.10 28th September 2007
         Fix check_http buffer overflow vulnerability when following HTTP redirects
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1b309846..36ff245c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,6 +10,6 @@ EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h base64.h
 
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-test:
-        cd tests && make test
+test test-debug:
+        cd tests && make $@
 
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 2f464002..0ddc8abf 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -39,5 +39,8 @@ test_base64_LDFLAGS = -L/usr/local/lib -ltap
 test_base64_LDADD = ../base64.o 
 
 test: ${noinst_PROGRAMS}
+        perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
+
+test-debug: ${noinst_PROGRAMS}
         perl -MTest::Harness -e '$$Test::Harness::verbose=1; $$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
 
diff --git a/perlmods/Makefile.am b/perlmods/Makefile.am
index ebed523b..3f479f3b 100644
--- a/perlmods/Makefile.am
+++ b/perlmods/Makefile.am
@@ -6,7 +6,8 @@ all-local:
 install-exec-local:
         $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i .
 
-test:
+# Don't run test-debug differently here yet
+test test-debug:
         $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -t .
 
 clean-local:
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 6656881d..01fca20d 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -22,6 +22,10 @@ test:
         perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
         perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t   # utils.t is excluded from above, so manually ask to test
 
+test-debug:
+        NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
+        NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t  # utils.t is excluded from above, so manually ask to test
+
 CLEANFILES=$(libexec_SCRIPTS)
 
 .pl :
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index eafcc5cd..30080aeb 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -44,6 +44,9 @@ TESTS = @PLUGIN_TEST@
 test:
         perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
 
+test-debug:
+        NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
+
 ##############################################################################
 # the actual targets
 
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 70fb07a3..93c40631 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -266,8 +266,8 @@ sub make {
 
 sub maketest {
         # Tests
-        print LOG "LANG=C make test 2>&1\n";
-        open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
+        print LOG "LANG=C make test-debug 2>&1\n";
+        open( MAKE, "LANG=C make test-debug && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
         while ( <MAKE> ) {
                 print $_;
                 print LOG $_;