X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2Fprep-disk;h=f37a68297b11d2502190f71a51305dc41f5510a2;hb=bf077c029772a067944ef777b3b6873bb4f2b9e9;hp=c775a4e7ae14b53901613a8b710ec9f1f7037597;hpb=ae20a83cc5ed14f276f2292d99079370562addc9;p=pintos-anon

diff --git a/grading/userprog/prep-disk b/grading/userprog/prep-disk
index c775a4e..f37a682 100755
--- a/grading/userprog/prep-disk
+++ b/grading/userprog/prep-disk
@@ -2,6 +2,7 @@
 
 use strict;
 use Getopt::Long;
+use POSIX;
 
 my ($pintos) = "pintos";
 my ($os_disk) = "../../src/userprog/build/os.dsk";
@@ -33,25 +34,35 @@ if (! -e $os_disk) {
 our ($formatted) = 0;
 
 unlink $fs_disk;
-xsystem ("$pintos make-disk '$fs_disk' 2");
+xsystem (0, "$pintos make-disk '$fs_disk' 2");
 put_file ("$test");
 put_file ("sample.txt")
     if grep ($_ eq $test,
 	     qw (open-normal open-boundary open-twice
 		 close-normal close-twice
 		 read-normal read-bad-ptr read-boundary read-zero
-		 write-normal write-boundary write-zero));		 
+		 write-normal write-bad-ptr write-boundary write-zero
+		 multi-child-fd));
+put_file ("child-simple")
+    if grep ($_ eq $test,
+	     qw (exec-once exec-multiple
+		 join-simple join-twice));
+put_file ("child-arg") if $test eq 'exec-arg';
+put_file ("child-close") if $test eq 'multi-child-fd';
+put_file ("child-bad") if $test eq 'join-killed';
 
 sub put_file {
     my ($fn) = @_;
     my ($cmd) = "$pintos -v --os-disk='$os_disk' --fs-disk='$fs_disk' put";
     $cmd .= " -f", $formatted = 1 if !$formatted;
     $cmd .= " '$fn'";
-    xsystem ($cmd);
+    xsystem (1, $cmd);
 }
 
 sub xsystem {
-    my ($cmd) = @_;
+    my ($expect, $cmd) = @_;
     print "$cmd\n";
-    system ($cmd) == 0 || die "command failed\n";
+    my ($code) = system ($cmd);
+    WIFEXITED ($code) && WEXITSTATUS ($code) == $expect
+	or die "command failed\n";
 }