X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fthreads%2Frun-tests;h=7fcc91cc6853256f82712f0f5f19be62d00d8cca;hb=b8ac41bfd566e33c8736d0024bd0bb3f1287f819;hp=1783ca9550c421547161fd249c75375e0e0f6b5c;hpb=daceab5ab2f2a6138ee9f2c612cd4e89928eb251;p=pintos-anon

diff --git a/grading/threads/run-tests b/grading/threads/run-tests
index 1783ca9..7fcc91c 100755
--- a/grading/threads/run-tests
+++ b/grading/threads/run-tests
@@ -156,7 +156,7 @@ sub run_test {
     }
 
     # Really run the test.
-    $status = really_run_test ($test);
+    my ($status) = really_run_test ($test);
 
     # Save the results for later.
     open (DONE, ">output/$test/done") or die "output/$test/done: create: $!\n";
@@ -171,7 +171,8 @@ sub really_run_test {
     # If there's residue from an earlier test, move it to .old.
     # If there's already a .old, delete it.
     xsystem ("rm -rf output/$test.old", VERBOSE => 1) if -d "output/$test.old";
-    rename "output/$test", "output/$test.old" or die "rename: $!\n";
+    rename "output/$test", "output/$test.old" or die "rename: $!\n"
+	if -d "output/$test";
 
     # Make output directory.
     mkdir "output/$test";
@@ -430,8 +431,10 @@ sub verify_common {
 		$A2L = "i386-elf-addr2line";
 	    }
 	    open (A2L, "$A2L -fe output/$test/kernel.o @addrs|");
-	    while (my $function = <A2L>) {
-		my ($line) = <A2L>;
+	    for (;;) {
+		my ($function, $line);
+		last unless $function = <A2L>;
+		$line = <A2L>;
 		chomp $function;
 		chomp $line;
 		$details .= "  $function ($line)\n";