X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fvm%2Frun-tests;h=85d639d616b5d1588a720608b266139a672affa1;hb=4da58067a819bb35897791b4361ceba85ba7ffb2;hp=f74bd9978aaec241878ce68cb59c5f473035ccdd;hpb=83fc2d89cf608ee9395b853c0628fc684c6f250e;p=pintos-anon diff --git a/grading/vm/run-tests b/grading/vm/run-tests index f74bd99..85d639d 100755 --- a/grading/vm/run-tests +++ b/grading/vm/run-tests @@ -263,17 +263,17 @@ sub really_run_test { # Run. my ($timeout) = 600; my ($testargs) = defined ($args{$test}) ? " $args{$test}" : ""; - xsystem ("pintos " - . "--os-disk=pintos/src/vm/build/os.dsk " - . "--fs-disk=output/$test/fs.dsk " - . "--swap-disk=output/$test/swap.dsk " - . "-v run -q -ex \"$test$testargs\"", - LOG => "$test/run", - TIMEOUT => $timeout, - EXPECT => 1) - or return "Bochs error"; - - return "ok"; + my ($result) = xsystem ("pintos " + . "--os-disk=pintos/src/vm/build/os.dsk " + . "--fs-disk=output/$test/fs.dsk " + . "--swap-disk=output/$test/swap.dsk " + . "-v run -q -ex \"$test$testargs\"", + LOG => "$test/run", + TIMEOUT => $timeout, + EXPECT => 1) + ? "ok" : "Bochs error"; + remove ("output/$test/fs.dsk", "output/$test/swap.dsk"); + return $result; } sub grade_test {