kilkilkil

[simgrid.git] / checkall

diff --git a/checkall b/checkall
index 8bfc39f..4512f3e 100755 (executable)
--- a/checkall
+++ b/checkall
@@ -15,7 +15,7 @@ open LOG,(">checkall.log") || die "Cannot open log file: $!";
 
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
 print LOG "Build started on $hour:$min:$sec $mon/$mday/$year\n\n";
 
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
 print LOG "Build started on $hour:$min:$sec $mon/$mday/$year\n\n";

-open MAKE,("make |") || die "Cannot fork a make: $!";
+open MAKE,("make 2>&1 |") || die "Cannot fork a make: $!";

 while (<MAKE>) {
     print     $_;
     print LOG $_;
 while (<MAKE>) {
     print     $_;
     print LOG $_;


@@ -30,7 +30,7 @@ if (!close MAKE) {
     exit 1;
 }
     
     exit 1;
 }
     

-open CHECK,("make -k check|") || die "Cannot fork a make check: $!";
+open CHECK,("make -k check 2>&1 |") || die "Cannot fork a make check: $!";

 while (<CHECK>) {
     print     $_;
     print LOG $_;
 while (<CHECK>) {
     print     $_;
     print LOG $_;


@@ -65,26 +65,26 @@ $banner = "# $banner #";
 my $dashes = $banner;
 $dashes =~ s/./#/g;
 print LOG "\n$dashes\n$banner\n$dashes\n\n";
 my $dashes = $banner;
 $dashes =~ s/./#/g;
 print LOG "\n$dashes\n$banner\n$dashes\n\n";

-print     "\n$dashes\n$banner (full logs in checkall.pl)\n$dashes\n\n";
+print     "\n$dashes\n$banner (full logs in checkall.log)\n$dashes\n\n";

 
 if (scalar @skip) {
 
 if (scalar @skip) {

-    print LOG "Skipped tests:\n";
-    print     "Skipped tests:\n";
+    print LOG "* ".(scalar @skip)." skipped tests:\n";
+    print     "* ".(scalar @skip)." skipped tests:\n";

     map {print "  $_\n";print LOG "  $_\n"} @skip;
 }
 if (scalar @xpass) {
     map {print "  $_\n";print LOG "  $_\n"} @skip;
 }
 if (scalar @xpass) {

-    print LOG "Unexpected pass:\n";
-    print     "Unexpected pass:\n";
+    print LOG "* ".(scalar @xpass)." unexpected pass:\n";
+    print     "* ".(scalar @xpass)." unexpected pass:\n";

     map {print "  $_\n";print LOG "  $_\n"} @xpass;
 }
 if (scalar @xfail) {
     map {print "  $_\n";print LOG "  $_\n"} @xpass;
 }
 if (scalar @xfail) {

-    print LOG "Expected failures:\n";
-    print     "Expected failures:\n";
+    print LOG "* ".(scalar @xfail)." expected failures:\n";
+    print     "* ".(scalar @xfail)." expected failures:\n";

     map {print "  $_\n";print LOG "  $_\n"} @xfail;
 }
 if (scalar @fail) {
     map {print "  $_\n";print LOG "  $_\n"} @xfail;
 }
 if (scalar @fail) {

-    print LOG "Failed tests:\n";
-    print     "Failed tests:\n";
+    print LOG "* ".(scalar @fail)." failed tests:\n";
+    print     "* ".(scalar @fail)." failed tests:\n";

     map {print "  $_\n";print LOG "  $_\n"} @fail;
 }
 
     map {print "  $_\n";print LOG "  $_\n"} @fail;
 }