From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Wed, 18 Mar 2009 07:30:40 +0000 (-0400)
Subject: Fix logging of STDERR in tinderbox tests phase
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d5ea0d19fae57dc1c54b4429def2bb35cd94414f;p=nagiosplug.git

Fix logging of STDERR in tinderbox tests phase
---

diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 04c691e..12528d9 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -246,7 +246,7 @@ sub SetupPath {
 
 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 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 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 $_;