X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fthreads%2Frun-tests;h=73ab9a0697087724decac48e67dda3cb733ff70f;hb=415941c1e0a6fc5ce263d8355fde980239c0f844;hp=096bec0a08285bbf8cc034da210154661680d10d;hpb=27e2fa0176f088ee129a65130322574f3807c67c;p=pintos-anon diff --git a/grading/threads/run-tests b/grading/threads/run-tests index 096bec0..73ab9a0 100755 --- a/grading/threads/run-tests +++ b/grading/threads/run-tests @@ -21,17 +21,13 @@ our (%details); our (%result); our ($action); -parse_cmd_line (); - -# Default set of tests. -@TESTS = ("alarm-single", "alarm-multiple", "alarm-zero", "alarm-negative", - "join-simple", - "join-quick", "join-multiple", "join-nested", - "join-dummy", "join-invalid", "join-no", - "priority-preempt", "priority-fifo", "priority-donate-one", - "priority-donate-multiple", "priority-donate-nest", - "mlfqs-on", "mlfqs-off") - unless @TESTS > 0; +parse_cmd_line qw (alarm-single alarm-multiple alarm-zero alarm-negative + join-simple + join-quick join-multiple join-nested + join-dummy join-invalid join-no + priority-preempt priority-fifo priority-donate-one + priority-donate-multiple priority-donate-nest + mlfqs-on mlfqs-off); clean_dir (), exit if $action eq 'clean'; @@ -41,15 +37,17 @@ exit if $action eq 'extract'; build (); exit if $action eq 'build'; -run_and_grade_tests (); -grade_mlfqs_speedup (); -grade_mlfqs_priority (); +run_and_grade_tests (); +if (defined ($result{'mlfqs-on'}) && defined ($result{'mlfqs-off'})) { + grade_mlfqs_speedup (); + grade_mlfqs_priority (); +} 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'";