summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2009-03-18 07:30:40 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2009-03-18 07:34:39 (GMT)
commitd5ea0d19fae57dc1c54b4429def2bb35cd94414f (patch)
tree00219174f36c29a1a00bf18ec3adb94f87716a28 /tools
parentd41a33a434558189300113c28b26e2d3d681d390 (diff)
downloadmonitoring-plugins-d5ea0d19fae57dc1c54b4429def2bb35cd94414f.tar.gz
Fix logging of STDERR in tinderbox tests phase
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tinderbox_build6
1 files changed, 3 insertions, 3 deletions
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 {
246 246
247sub configure { 247sub configure {
248 # Configure 248 # Configure
249 print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs\n"; 249 print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
250 open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n"; 250 open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
251 while (<CONFIGURE>) { 251 while (<CONFIGURE>) {
252 print $_; 252 print $_;
@@ -270,8 +270,8 @@ sub make {
270 270
271sub maketest { 271sub maketest {
272 # Tests 272 # Tests
273 print LOG "LANG=C make test 2>&1\n"; 273 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";
274 open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |"); 274 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 |");
275 while ( <MAKE> ) { 275 while ( <MAKE> ) {
276 print $_; 276 print $_;
277 print LOG $_; 277 print LOG $_;