Run tinderbox builds in a test debug mode using "make test-debug"

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1866 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/Makefile.am b/Makefile.am
index 701c56cc231ef3a874f67520b6b74a4a8db419cb..416ef62bc8f2d784d162e1d7bc75a0523003d007 100644 (file)
--- 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 a481b58a6394d0aeba9a69a550fead6aafcca19e..b08bd02a5c86eae6657c35e0d8195e51a50893fb 100644 (file)
--- 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 1b309846dfb7b3d9a3ff8f86ce3c4b4aac426591..36ff245c467f465afd1f330b78a2648fd862269a 100644 (file)
--- 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 2f46400263422d99a6459005369a7234ea17e2c8..0ddc8abf8e42561fd01406c7fd7d8a6a39cf721f 100644 (file)
--- 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 ebed523bef518131829fac55302ae69942601157..3f479f3b6a663e1b7647cb55cedf70fb721bddaa 100644 (file)
--- 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 6656881db07710b3eb3cf311a7d207bbda583e70..01fca20d2eb95d49cc9db67eb71b4573d3743dc6 100644 (file)
--- 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 eafcc5cdf78450455f7189c6f0cd2e958d142c9c..30080aeb4334d4da209e59034da71d96d34495ec 100644 (file)
--- 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 70fb07a36d249708c84a22722085c11efd975561..93c40631e8bad1ff2870b5785ed0bbef81a24e5e 100755 (executable)
--- 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 $_;