Use standard POSIX "ustar" format for the scratch disk.

[pintos-anon] / src / tests / make-grade

diff --git a/src/tests/make-grade b/src/tests/make-grade
index 20e0cd9e3d7bf58b4787edbe4aa2b072297e57e1..a3faa0ebd560ac1f5af6b1180a50f489125860ca 100755 (executable)
--- a/src/tests/make-grade
+++ b/src/tests/make-grade
@@ -25,7 +25,7 @@ open (GRADING, '<', $grading_file) || die "$grading_file: open: $!\n";
 while (<GRADING>) {
     s/#.*//;
     next if /^\s*$/;
-    my ($max_pct, $rubric_suffix) = /^\s*(\d+)%\t(.*)/ or die;
+    my ($max_pct, $rubric_suffix) = /^\s*(\d+(?:\.\d+)?)%\t(.*)/ or die;
     my ($dir) = $rubric_suffix =~ /^(.*)\//;
     my ($rubric_file) = "$src_dir/$rubric_suffix";
     open (RUBRIC, '<', $rubric_file) or die "$rubric_file: open: $!\n";
@@ -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,34 +110,43 @@ 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, '');
 
 print map ("$_\n", @overall, @divider, @summary, @divider, @rubrics);
 
 for my $test (@failures) {
-    open (RESULT, '<', "$test.result") or next;
     print map ("$_\n", @divider);
     print "DETAILS OF $test FAILURE:\n\n";
-    my $first_line = <RESULT>;
-    my ($cnt) = 0;
-    while (<RESULT>) {
-       print;
-       $cnt++;
+
+    if (open (RESULT, '<', "$test.result")) {
+       my $first_line = <RESULT>;
+       my ($cnt) = 0;
+       while (<RESULT>) {
+           print;
+           $cnt++;
+       }
+       close (RESULT);
     }
-    close (RESULT);
 
-    if ($cnt == 0) {
-       open (OUTPUT, '<', "$test.output") or next;
-       my ($panics) = 0;
+    if (open (OUTPUT, '<', "$test.output")) {
+       print "\nOUTPUT FROM $test:\n\n";
+    
+       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);
     }
 }
-