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

diff --git a/grading/lib/Pintos/Grading.pm b/grading/lib/Pintos/Grading.pm
index f29dc05..240b16e 100644
--- a/grading/lib/Pintos/Grading.pm
+++ b/grading/lib/Pintos/Grading.pm
@@ -138,10 +138,9 @@ sub extract_sources {
 		 LOG => $stem, DIE => "applying patch $stem failed\n");
     }
 
-    # Install default pintos/src/constants.h.
+    # Install default pintos/src/constants.h (which is empty).
     open (CONSTANTS, ">pintos/src/constants.h")
 	or die "constants.h: create: $!\n";
-    print CONSTANTS "#define THREAD_JOIN_IMPLEMENTED 1\n";
     close CONSTANTS;
 }
 
@@ -423,12 +422,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);