فهرست منبع

Fix logging of STDERR in tinderbox tests phase

Thomas Guyot-Sionnest 17 سال پیش
والد
کامیت
d5ea0d19fa
1فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 3 3
      tools/tinderbox_build

+ 3 - 3
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 $_;