From: Ben Pfaff Date: Tue, 23 Nov 2004 01:56:00 +0000 (+0000) Subject: Fix treatment of timeouts in run-tests and pintos. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8272d44935750ff99fac2a9dba00cbfe6b63dbb0;p=pintos-anon Fix treatment of timeouts in run-tests and pintos. --- diff --git a/grading/vm/run-tests b/grading/vm/run-tests index 61adbaf..b6987fe 100755 --- a/grading/vm/run-tests +++ b/grading/vm/run-tests @@ -694,6 +694,8 @@ sub xsystem { $status = $?; alarm 0; }; + + my ($ok); if ($@) { die unless $@ eq "alarm\n"; # propagate unexpected errors print "Timed out: "; @@ -705,21 +707,21 @@ sub xsystem { print "Waiting for $pid to die" if $i == 0; print "."; } - $status = 0; - } + $ok = 1; + } else { + if (WIFSIGNALED ($status)) { + my ($signal) = WTERMSIG ($status); + die "Interrupted\n" if $signal == SIGINT; + print "Child terminated with signal $signal\n"; + } - if (WIFSIGNALED ($status)) { - my ($signal) = WTERMSIG ($status); - die "Interrupted\n" if $signal == SIGINT; - print "Child terminated with signal $signal\n"; + my ($exp_status) = !defined ($options{EXPECT}) ? 0 : $options{EXPECT}; + $ok = WIFEXITED ($status) && WEXITSTATUS ($status) == $exp_status; } - my ($expected_exit) = !defined ($options{EXPECT}) ? 0 : $options{EXPECT}; - my ($ok) = WIFEXITED ($status) && WEXITSTATUS ($status) == $expected_exit; - unlink ("output/$log.err") if defined ($log) && $ok; - die $options{DIE} if $status != 0 && defined $options{DIE}; + die $options{DIE} if !$ok && defined $options{DIE}; return $ok; }