X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Ffilesys%2Frun-tests;h=1b768abf84beb073ab3d15a5e4c1bf9fb7f1a0ad;hb=654121cfc127bc8e1e9aa8859c2d68f0dc4330cb;hp=7251cef06c412b4f2052ef63cf4feb2c92ea6e46;hpb=39e2b81b7bb61f390e5bb0a3972f943ef133b7b9;p=pintos-anon

diff --git a/grading/filesys/run-tests b/grading/filesys/run-tests
index 7251cef..1b768ab 100755
--- a/grading/filesys/run-tests
+++ b/grading/filesys/run-tests
@@ -64,13 +64,12 @@ sub run_test {
 	     DIE => "failed to create swap disk");
 
     # Format disk, install test.
-    my ($pintos_base_cmd) =
-	"pintos "
-	. "--os-disk=pintos/src/$hw/build/os.dsk "
-	. "--fs-disk=output/$test/fs.dsk "
-	. "--swap-disk=output/$test/swap.dsk "
-	. "-v";
-    $result = run_pintos ("$pintos_base_cmd put -f $GRADES_DIR/$test $test",
+    my (@base_opts) = ("--os-disk=pintos/src/$hw/build/os.dsk",
+		       "--fs-disk=output/$test/fs.dsk",
+		       "--swap-disk=output/$test/swap.dsk",
+		       "-v");
+    $result = run_pintos ([@base_opts,
+			   "put", "-f", "$GRADES_DIR/$test", $test],
 			  LOG => "$test/put", TIMEOUT => 60);
     return $result if $result ne 'ok';
 
@@ -79,13 +78,13 @@ sub run_test {
     push (@extra_files, "child-syn-wrt") if $test eq 'syn-write';
     push (@extra_files, "child-syn-rw") if $test eq 'syn-rw';
     for my $fn (@extra_files) {
-	$result = run_pintos ("$pintos_base_cmd put $GRADES_DIR/$fn $fn",
+	$result = run_pintos ([@base_opts, "put", "$GRADES_DIR/$fn", $fn],
 			      LOG => "$test/put-$fn", TIMEOUT => 60);
 	return "Error running `put $fn': $result" if $result ne 'ok';
     }
     
     # Run.
-    return run_pintos ("$pintos_base_cmd run -q -ex \"$test\"",
+    return run_pintos ([@base_opts, "run", "-q", "-ex", $test],
 		       LOG => "$test/run", TIMEOUT => 120);
 }