X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2Frun-tests;h=e81b5330804911c0ecd3f3a00be89875d6b67970;hb=2cfc156c39840ce7f1cda6b473de1322691a8a0b;hp=ec185eebd47194f213ee97c82fc84995e6af7d99;hpb=415941c1e0a6fc5ce263d8355fde980239c0f844;p=pintos-anon

diff --git a/grading/userprog/run-tests b/grading/userprog/run-tests
index ec185ee..e81b533 100755
--- a/grading/userprog/run-tests
+++ b/grading/userprog/run-tests
@@ -43,7 +43,7 @@ parse_cmd_line qw (args-argc args-argv0 args-argvn args-single args-multiple
 		   write-normal write-bad-ptr write-boundary write-zero
 		   write-stdin write-bad-fd
 		   exec-once exec-arg exec-multiple exec-missing exec-bad-ptr
-		   join-simple join-twice join-killed join-bad-pid
+		   wait-simple wait-twice wait-killed wait-bad-pid
 		   multi-recurse multi-oom multi-child-fd);
 
 clean_dir (), exit if $action eq 'clean';
@@ -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,13 +163,11 @@ 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,
-			       EXPECT => 0);
+			       TIMEOUT => 10);
     die "`pintos get $guest_fn' failed - $result\n"
 	if $result ne 'ok';
 }