X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2Frun-tests;fp=grading%2Fuserprog%2Frun-tests;h=b09bc5e200a589f2031f60494a7afbad10b6e875;hb=2969f4df6a95b37e05ad6aa562ae82206b646eb0;hp=a13566b2ac2291a3c9afaf2e5315feb02344a689;hpb=6c75d304d238c3dfdd2aef62decd60a16bb64c7d;p=pintos-anon diff --git a/grading/userprog/run-tests b/grading/userprog/run-tests index a13566b..b09bc5e 100755 --- a/grading/userprog/run-tests +++ b/grading/userprog/run-tests @@ -82,10 +82,9 @@ sub run_test { # Run. my ($timeout) = $test !~ /^multi-/ ? 10 : 600; - my ($result) = run_pintos ("pintos " - . "--os-disk=pintos/src/userprog/build/os.dsk " - . "--fs-disk=output/$test/fs.dsk " - . "-v run -q -ex \"$test$args\"", + my ($result) = run_pintos (["--os-disk=pintos/src/userprog/build/os.dsk", + "--fs-disk=output/$test/fs.dsk", + "-v", "run", "-q", "-ex", "$test$args"], LOG => "$test/run", TIMEOUT => $timeout); rename "output/$test/fs.dsk", "output/$test/fs.dsk.keep" @@ -164,10 +163,9 @@ sub grade_multi_oom { sub get_file { my ($guest_fn, $host_fn) = @_; - my ($result) = run_pintos ("pintos " - . "--os-disk=pintos/src/userprog/build/os.dsk " - . "--fs-disk=output/$test/fs.dsk.keep " - . "-v get $guest_fn $host_fn", + my ($result) = run_pintos (["--os-disk=pintos/src/userprog/build/os.dsk", + "--fs-disk=output/$test/fs.dsk.keep", + "-v", "get", "$guest_fn", "$host_fn"], LOG => "$test/get-$guest_fn", TIMEOUT => 10); die "`pintos get $guest_fn' failed - $result\n"