X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fthreads%2Frun-tests;h=0852f6f99536d11953debf5d61b4141c6e8ead38;hb=18654de05aa2c2fa2cc63e2c9c30b9dc536a33d7;hp=4199d94214f09b9b61348ff487f620937ea39dcd;hpb=7c38b05730fa5fe5a145dc65f9a4a82dc0357589;p=pintos-anon diff --git a/grading/threads/run-tests b/grading/threads/run-tests index 4199d94..0852f6f 100755 --- a/grading/threads/run-tests +++ b/grading/threads/run-tests @@ -44,10 +44,10 @@ if (defined ($result{'mlfqs-on'}) && defined ($result{'mlfqs-off'})) { } write_grades (); write_details (); -exit if $action eq 'test'; +exit success () if $action eq 'test'; assemble_final_grade (); -exit if $action eq 'assemble'; +exit success () if $action eq 'assemble'; die "Don't know how to '$action'"; @@ -94,8 +94,9 @@ sub run_test { xsystem ("cp pintos/src/threads/build/os.dsk output/$test"); # Run. - my ($timeout) = $test !~ /^mlfqs/ ? 10 : 600; - return run_pintos ("cd pintos/src/threads/build && pintos -v run -q", + my ($timeout) = $test !~ /^mlfqs/ ? 15 : 600; + return run_pintos (["-v", "run", "-q"], + CHDIR => "pintos/src/threads/build", LOG => "$test/run", TIMEOUT => $timeout); }