X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Flib%2FPintos%2FGrading.pm;h=90d9ba311ce548636748097f9a7f7a32c7d5b1ee;hb=35692cf4733c0761f25dc17153eeaf8a64c1e0ee;hp=f29dc05f7c9ae494682c0ea49eb0f99ea2a5d22d;hpb=44b7b37aebbef7a35c5cbe83da80bd8577498849;p=pintos-anon

diff --git a/grading/lib/Pintos/Grading.pm b/grading/lib/Pintos/Grading.pm
index f29dc05..90d9ba3 100644
--- a/grading/lib/Pintos/Grading.pm
+++ b/grading/lib/Pintos/Grading.pm
@@ -423,12 +423,12 @@ sub grade_test {
     # Read test output.
     my ($outfile) = "output/$test/run.out";
     if (! -e $outfile) {
-	if (-s "output/$test.make.err") {
+	if (-s "output/$test/make.err") {
 	    # make failed.
-	    $details{$test} = snarf ("output/$test.make.err");
+	    $details{$test} = snarf ("output/$test/make.err");
 	    return "make failed.  Error messages at end of file.";
 	}
-	die "$outfile: missing test output file";
+	return "preparation for test failed";
     }
     my (@output) = snarf ($outfile);
 
@@ -698,7 +698,7 @@ sub canonicalize_exit_codes {
 }
 
 sub strip_exit_codes {
-    return grep (!/^[-a-z0-9]+: exit\(-?\d+\)/, canonicalize_exit_codes (@_));
+    return grep (!/^[-_a-z0-9]+: exit\(-?\d+\)/, canonicalize_exit_codes (@_));
 }
 
 sub compare_output {