X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fmake-grade;h=a3faa0ebd560ac1f5af6b1180a50f489125860ca;hb=0b01eb8d16b9ff48657aceec17d68522b2a3cfdf;hp=e6c4b9cdaad627eec2f2ab46612f7b3c43b987ce;hpb=1b18b7d238bdd54d416331436220e4517c4b35db;p=pintos-anon

diff --git a/src/tests/make-grade b/src/tests/make-grade
index e6c4b9c..a3faa0e 100755
--- a/src/tests/make-grade
+++ b/src/tests/make-grade
@@ -72,7 +72,7 @@ while (<GRADING>) {
     push (@rubrics, '');
 
     my ($pct) = ($score / $possible) * $max_pct;
-    push (@summary, sprintf ("%-40s %3d/%3d %5.1f%%/%5.1f%%",
+    push (@summary, sprintf ("%-45s %3d/%3d %5.1f%%/%5.1f%%",
 			     $rubric_suffix,
 			     $score, $possible,
 			     $pct, $max_pct));
@@ -82,16 +82,16 @@ while (<GRADING>) {
 close GRADING;
 
 my ($sum_line)
-  = "---------------------------------------- --- --- ------ ------";
+  = "--------------------------------------------- --- --- ------ ------";
 unshift (@summary,
 	 "SUMMARY BY TEST SET",
 	 '',
-	 sprintf ("%-40s %3s %3s %6s %6s",
+	 sprintf ("%-45s %3s %3s %6s %6s",
 		  "Test Set", "Pts", "Max", "% Ttl", "% Max"),
 	 $sum_line);
 push (@summary,
       $sum_line,
-      sprintf ("%-40s %3s %3s %5.1f%%/%5.1f%%",
+      sprintf ("%-45s %3s %3s %5.1f%%/%5.1f%%",
 	       'Total', '', '', $pct_actual, $pct_possible));
 
 unshift (@rubrics,
@@ -110,6 +110,9 @@ foreach my $name (keys (%verdicts)) {
     }
 }
 push (@overall, sprintf ("TOTAL TESTING SCORE: %.1f%%", $pct_actual));
+if (sprintf ("%.1f", $pct_actual) eq sprintf ("%.1f", $pct_possible)) {
+    push (@overall, "ALL TESTED PASSED -- PERFECT SCORE");
+}
 
 my (@divider) = ('', '- ' x 38, '');
 
@@ -132,13 +135,17 @@ for my $test (@failures) {
     if (open (OUTPUT, '<', "$test.output")) {
 	print "\nOUTPUT FROM $test:\n\n";
     
-	my ($panics) = 0;
+	my ($panics, $boots) = (0, 0);
 	while (<OUTPUT>) {
 	    if (/PANIC/ && ++$panics > 2) {
 		print "[...details of additional panic(s) omitted...]\n";
 		last;
 	    }
 	    print;
+	    if (/Pintos booting/ && ++$boots > 1) {
+		print "[...details of reboot(s) omitted...]\n";
+		last;
+	    }
 	}
 	close (OUTPUT);
     }