Fix treatment of timeouts in run-tests and pintos.

[pintos-anon] / grading / userprog / prep-disk

diff --git a/grading/userprog/prep-disk b/grading/userprog/prep-disk
index 2a5a9f118db518708ab863e54e09947c85d91cdd..1d34e5fb1a340ecaac39c084dc3f7c4abeafce8f 100755 (executable)
--- a/grading/userprog/prep-disk
+++ b/grading/userprog/prep-disk
@@ -40,9 +40,15 @@ put_file ("sample.txt")
             qw (open-normal open-boundary open-twice
                 close-normal close-twice
                 read-normal read-bad-ptr read-boundary read-zero
-                write-normal write-bad-ptr write-boundary write-zero));
-put_file ("child-simple") if $test eq 'exec-once' or $test eq 'exec-multiple';
+                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) = @_;