Revision: 1866
http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1866&view=rev
Author: tonvoon
Date: 2007-12-11 17:27:48 -0800 (Tue, 11 Dec 2007)
Log Message:
-----------
Run tinderbox builds in a test debug mode using "make test-debug"
Modified Paths:
--------------
nagiosplug/trunk/Makefile.am
nagiosplug/trunk/NEWS
nagiosplug/trunk/lib/Makefile.am
nagiosplug/trunk/lib/tests/Makefile.am
nagiosplug/trunk/perlmods/Makefile.am
nagiosplug/trunk/plugins/Makefile.am
nagiosplug/trunk/plugins-scripts/Makefile.am
nagiosplug/trunk/tools/tinderbox_build
Modified: nagiosplug/trunk/Makefile.am
===================================================================
--- nagiosplug/trunk/Makefile.am 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/Makefile.am 2007-12-12 01:27:48 UTC (rev 1866)
@@ -22,11 +22,11 @@
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}$$//" $? > $@
Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/NEWS 2007-12-12 01:27:48 UTC (rev 1866)
@@ -16,6 +16,7 @@
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
Modified: nagiosplug/trunk/lib/Makefile.am
===================================================================
--- nagiosplug/trunk/lib/Makefile.am 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/lib/Makefile.am 2007-12-12 01:27:48 UTC (rev 1866)
@@ -10,6 +10,6 @@
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 $@
Modified: nagiosplug/trunk/lib/tests/Makefile.am
===================================================================
--- nagiosplug/trunk/lib/tests/Makefile.am 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/lib/tests/Makefile.am 2007-12-12 01:27:48 UTC (rev 1866)
@@ -39,5 +39,8 @@
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)
Modified: nagiosplug/trunk/perlmods/Makefile.am
===================================================================
--- nagiosplug/trunk/perlmods/Makefile.am 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/perlmods/Makefile.am 2007-12-12 01:27:48 UTC (rev 1866)
@@ -6,7 +6,8 @@
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:
Modified: nagiosplug/trunk/plugins/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins/Makefile.am 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/plugins/Makefile.am 2007-12-12 01:27:48 UTC (rev 1866)
@@ -44,6 +44,9 @@
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
Modified: nagiosplug/trunk/plugins-scripts/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins-scripts/Makefile.am 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/plugins-scripts/Makefile.am 2007-12-12 01:27:48 UTC (rev 1866)
@@ -22,6 +22,10 @@
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 :
Modified: nagiosplug/trunk/tools/tinderbox_build
===================================================================
--- nagiosplug/trunk/tools/tinderbox_build 2007-12-11 13:54:23 UTC (rev 1865)
+++ nagiosplug/trunk/tools/tinderbox_build 2007-12-12 01:27:48 UTC (rev 1866)
@@ -266,8 +266,8 @@
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 $_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.