Allow decimal point in percentages.

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

diff --git a/src/tests/make-grade b/src/tests/make-grade
index 20e0cd9e3d7bf58b4787edbe4aa2b072297e57e1..e6c4b9cdaad627eec2f2ab46612f7b3c43b987ce 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";
@@ -116,19 +116,22 @@ 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;
+    if (open (OUTPUT, '<', "$test.output")) {
+       print "\nOUTPUT FROM $test:\n\n";
+    
        my ($panics) = 0;
        while (<OUTPUT>) {
            if (/PANIC/ && ++$panics > 2) {
@@ -140,4 +143,3 @@ for my $test (@failures) {
        close (OUTPUT);
     }
 }
-