[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2170] nagiosplug/trunk/tools/tinderbox_build
dermoth at users.sourceforge.net
dermoth at users.sourceforge.net
Wed Mar 18 08:39:26 CET 2009
Revision: 2170
http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2170&view=rev
Author: dermoth
Date: 2009-03-18 07:39:26 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Fix logging of STDERR in tinderbox tests phase
From: Thomas Guyot-Sionnest <dermoth at aei.ca>
Modified Paths:
--------------
nagiosplug/trunk/tools/tinderbox_build
Modified: nagiosplug/trunk/tools/tinderbox_build
===================================================================
--- nagiosplug/trunk/tools/tinderbox_build 2009-03-18 07:39:16 UTC (rev 2169)
+++ nagiosplug/trunk/tools/tinderbox_build 2009-03-18 07:39:26 UTC (rev 2170)
@@ -246,7 +246,7 @@
sub configure {
# Configure
- print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs\n";
+ print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
while (<CONFIGURE>) {
print $_;
@@ -270,8 +270,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 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1\n";
+ open( MAKE, "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && 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.
More information about the Commits
mailing list