Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / grading / userprog / Make.base

diff --git a/grading/userprog/Make.base b/grading/userprog/Make.base
index 365ef6c0f7ae35f0d202971168da82b82fca9af1..1e04ab80a14d6a2710bb54d771eeb6a849a0ef08 100644 (file)
--- a/grading/userprog/Make.base
+++ b/grading/userprog/Make.base
@@ -6,13 +6,18 @@ child_arg_SRC = child-arg.c
 child_bad_SRC = child-bad.c
 child_close_SRC = child-close.c
 
-DISKS = $(patsubst %,%.dsk,$(TESTS))
+DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
 
 disks: $(DISKS)
 
-exec-once.dsk exec-multiple.dsk join-simple.dsk join-twice.dsk: child-simple
+null.o: null.S
+null: null.o
+       $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+null.dsk: null 
+
+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: %
@@ -23,6 +28,8 @@ clean::
 
 include $(SRCDIR)/Makefile.userprog
 
+# Use -Werror because otherwise there's so much output spew
+# that it's very difficult to pick out warnings.
 CFLAGS += -Werror
 
 Makefile: Make.base Make.tests mkmf