X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa33d267921893d6a12de561721cadb23638f5da..a3570625c9460617ccad1803b50bc4f1793b6376:/checkall

diff --git a/checkall b/checkall
index 8bfc39f894..8243eacab0 100755
--- a/checkall
+++ b/checkall
@@ -14,8 +14,22 @@ my $dir;
 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";
-open MAKE,("make |") || die "Cannot fork a make: $!";
+print LOG "Build started on $hour:$min:$sec $mon/$mday/$year\n";
+print LOG "Current svn version is: ".qx(svnversion)."\n\n";
+
+print LOG "\nXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n";
+print LOG "XXX Include config.log since it contains valuable information XXX\n";
+print LOG "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n";
+open CFG,"<config.log" || die "Cannot open config.log: $!*";
+while (<CFG>) {
+    print LOG "$_";
+}
+close CFG;
+
+print LOG "\nXXXXXXXXXXXXXXXX\n";
+print LOG "XXX Run make XXX\n";
+print LOG "XXXXXXXXXXXXXXXX\n";
+open MAKE,("make 2>&1 |") || die "Cannot fork a make: $!";
 while (<MAKE>) {
     print     $_;
     print LOG $_;
@@ -30,7 +44,10 @@ if (!close MAKE) {
     exit 1;
 }
     
-open CHECK,("make -k check|") || die "Cannot fork a make check: $!";
+print LOG "\nXXXXXXXXXXXXXXXXXXXXXX\n";
+print LOG "XXX Run make check XXX\n";
+print LOG "XXXXXXXXXXXXXXXXXXXXXX\n";
+open CHECK,("make -k check 2>&1 |") || die "Cannot fork a make check: $!";
 while (<CHECK>) {
     print     $_;
     print LOG $_;
@@ -63,28 +80,32 @@ if (scalar @fail == 0) {
 }
 $banner = "# $banner #";
 my $dashes = $banner;
-$dashes =~ s/./#/g;
+$dashes =~ s/./X/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 @pass) {
+    print LOG "* ".(scalar @pass)." passed tests:\n";
+    map {print LOG "  $_\n"} @pass;
+}
 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) {
-    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) {
-    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) {
-    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;
 }