summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2007-12-12 01:27:48 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2007-12-12 01:27:48 (GMT)
commit151531173bd50d66548effa50ef7393a8c680513 (patch)
tree7812c912217e191931e71c6138cf694916c914d2
parent27627ee6c20d57096ee9364b144f59180a96c3ac (diff)
downloadmonitoring-plugins-151531173bd50d66548effa50ef7393a8c680513.tar.gz
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
-rw-r--r--Makefile.am10
-rw-r--r--NEWS1
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/tests/Makefile.am3
-rw-r--r--perlmods/Makefile.am3
-rw-r--r--plugins-scripts/Makefile.am4
-rw-r--r--plugins/Makefile.am3
-rwxr-xr-xtools/tinderbox_build4
8 files changed, 22 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 701c56c..416ef62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,11 +22,11 @@ dist-hook:
22install-root: 22install-root:
23 cd plugins-root && $(MAKE) $@ 23 cd plugins-root && $(MAKE) $@
24 24
25test: 25test test-debug:
26 cd lib && $(MAKE) test 26 cd lib && $(MAKE) $@
27 if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi 27 if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
28 cd plugins && $(MAKE) test 28 cd plugins && $(MAKE) $@
29 cd plugins-scripts && $(MAKE) test 29 cd plugins-scripts && $(MAKE) $@
30 30
31nagios-plugins.spec: nagios-plugins.spec.in 31nagios-plugins.spec: nagios-plugins.spec.in
32 sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@ 32 sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
diff --git a/NEWS b/NEWS
index a481b58..b08bd02 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ This file documents the major additions and syntax changes between releases.
16 Fix check_disk reporting OK if disk usage grows over 100% (bug #1348746). 16 Fix check_disk reporting OK if disk usage grows over 100% (bug #1348746).
17 The problem happens to be in Gnulib but a workaround have been implemented in check_disk.c 17 The problem happens to be in Gnulib but a workaround have been implemented in check_disk.c
18 Fix check_load argument handling when not passing triplets (bug #1831890) 18 Fix check_load argument handling when not passing triplets (bug #1831890)
19 Tinderbox builds now run tests in a verbose mode
19 20
201.4.10 28th September 2007 211.4.10 28th September 2007
21 Fix check_http buffer overflow vulnerability when following HTTP redirects 22 Fix check_http buffer overflow vulnerability when following HTTP redirects
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1b30984..36ff245 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
10 10
11INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins 11INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
12 12
13test: 13test test-debug:
14 cd tests && make test 14 cd tests && make $@
15 15
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 2f46400..0ddc8ab 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -39,5 +39,8 @@ test_base64_LDFLAGS = -L/usr/local/lib -ltap
39test_base64_LDADD = ../base64.o 39test_base64_LDADD = ../base64.o
40 40
41test: ${noinst_PROGRAMS} 41test: ${noinst_PROGRAMS}
42 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
43
44test-debug: ${noinst_PROGRAMS}
42 perl -MTest::Harness -e '$$Test::Harness::verbose=1; $$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) 45 perl -MTest::Harness -e '$$Test::Harness::verbose=1; $$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
43 46
diff --git a/perlmods/Makefile.am b/perlmods/Makefile.am
index ebed523..3f479f3 100644
--- a/perlmods/Makefile.am
+++ b/perlmods/Makefile.am
@@ -6,7 +6,8 @@ all-local:
6install-exec-local: 6install-exec-local:
7 $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i . 7 $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i .
8 8
9test: 9# Don't run test-debug differently here yet
10test test-debug:
10 $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -t . 11 $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -t .
11 12
12clean-local: 13clean-local:
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 6656881..01fca20 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -22,6 +22,10 @@ test:
22 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl 22 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
23 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test 23 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test
24 24
25test-debug:
26 NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
27 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
28
25CLEANFILES=$(libexec_SCRIPTS) 29CLEANFILES=$(libexec_SCRIPTS)
26 30
27.pl : 31.pl :
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index eafcc5c..30080ae 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -44,6 +44,9 @@ TESTS = @PLUGIN_TEST@
44test: 44test:
45 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl 45 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
46 46
47test-debug:
48 NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
49
47############################################################################## 50##############################################################################
48# the actual targets 51# the actual targets
49 52
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 70fb07a..93c4063 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -266,8 +266,8 @@ sub make {
266 266
267sub maketest { 267sub maketest {
268 # Tests 268 # Tests
269 print LOG "LANG=C make test 2>&1\n"; 269 print LOG "LANG=C make test-debug 2>&1\n";
270 open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |"); 270 open( MAKE, "LANG=C make test-debug && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
271 while ( <MAKE> ) { 271 while ( <MAKE> ) {
272 print $_; 272 print $_;
273 print LOG $_; 273 print LOG $_;