X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2FMakefile;h=225180f73f7a3bf81a00609d4f23e75e2acb45e6;hb=2cfc156c39840ce7f1cda6b473de1322691a8a0b;hp=0b1b5ff0adb5b2f2a4d4d264eff7c614bceb2023;hpb=da63cef9fbe1173816e835d4fcb07ba62bfe89de;p=pintos-anon

diff --git a/grading/userprog/Makefile b/grading/userprog/Makefile
index 0b1b5ff..225180f 100644
--- a/grading/userprog/Makefile
+++ b/grading/userprog/Makefile
@@ -11,7 +11,7 @@ TESTS = \
 	read-bad-ptr read-boundary read-zero read-stdout read-bad-fd \
 	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 \
+	exec-bad-ptr wait-simple wait-twice wait-killed wait-bad-pid \
 	multi-recurse multi-oom multi-child-fd
 args_argc_SRC = args-argc.c
 args_argv0_SRC = args-argv0.c
@@ -60,10 +60,10 @@ exec_arg_SRC = exec-arg.c
 exec_multiple_SRC = exec-multiple.c
 exec_missing_SRC = exec-missing.c
 exec_bad_ptr_SRC = exec-bad-ptr.c
-join_simple_SRC = join-simple.c
-join_twice_SRC = join-twice.c
-join_killed_SRC = join-killed.c
-join_bad_pid_SRC = join-bad-pid.c
+wait_simple_SRC = wait-simple.c
+wait_twice_SRC = wait-twice.c
+wait_killed_SRC = wait-killed.c
+wait_bad_pid_SRC = wait-bad-pid.c
 multi_recurse_SRC = multi-recurse.c
 multi_oom_SRC = multi-oom.c
 multi_child_fd_SRC = multi-child-fd.c
@@ -76,18 +76,18 @@ child_arg_SRC = child-arg.c
 child_bad_SRC = child-bad.c
 child_close_SRC = child-close.c
 
+DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
+
+disks: $(DISKS)
+
 null.o: null.S
 null: null.o
 	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 null.dsk: null	
 
-DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
-
-disks: $(DISKS)
-
-exec-once.dsk exec-multiple.dsk join-simple.dsk join-twice.dsk: child-simple
+exec-once.dsk exec-multiple.dsk wait-simple.dsk wait-twice.dsk: child-simple
 exec-arg.dsk: child-arg
-join-killed.dsk: child-bad
+wait-killed.dsk: child-bad
 multi-child-fd.dsk: child-close
 
 %.dsk: %