X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2FMakefile;h=25ba85759b7e0bbfab6354f8f4eb72adbd67950b;hb=2e39e25fd0af44f965c69f833ea5d41fc1edb175;hp=a928b97003a2edb7ae096fea380733117f72fb19;hpb=5979ba5edd96453f3658e58bdbd7686a4f4380e2;p=pintos-anon

diff --git a/grading/userprog/Makefile b/grading/userprog/Makefile
index a928b97..25ba857 100644
--- a/grading/userprog/Makefile
+++ b/grading/userprog/Makefile
@@ -1,6 +1,8 @@
 SRCDIR = ../../src
 
-SINGLETONS = create-normal create-empty create-null create-invalid create-long 
+SINGLETONS = \
+	$(addprefix create-, normal empty null bad-ptr long exists bound) \
+	$(addprefix args-, argc argv0 argvn single multiple dbl-space)
 
 define SINGLETON_PROG
 PROGS += $(1)
@@ -13,17 +15,17 @@ DISKS = $(patsubst %,%.dsk,$(PROGS))
 disks: $(DISKS)
 
 PINTOS = ../../src/utils/pintos
-%.dsk: % os.dsk
-	rm -f $@ fs.dsk
-	$(PINTOS) make-disk fs.dsk 2
-	$(PINTOS) -v run -f -q
-	$(PINTOS) -v put $<
-	mv fs.dsk $@
-
-os.dsk: ../../src/userprog/build/os.dsk
-	ln -sf $< $@
+OS_DISK = ../../src/userprog/build/os.dsk
+%.dsk: %
+	rm -f $@.tmp
+	$(PINTOS) make-disk $@.tmp 2
+	$(PINTOS) -v --os-disk=$(OS_DISK) --fs-disk=$@.tmp run -f -q
+	$(PINTOS) -v --os-disk=$(OS_DISK) --fs-disk=$@.tmp put $<
+	mv $@.tmp $@
 
 clean::
 	rm -f $(DISKS)
 
 include $(SRCDIR)/Makefile.userprog
+
+CFLAGS += -Werror