Add more tests.

[pintos-anon] / grading / userprog / Makefile

diff --git a/grading/userprog/Makefile b/grading/userprog/Makefile
index 25ba85759b7e0bbfab6354f8f4eb72adbd67950b..e95e13fdaf032568be18041a61059077f0ed6d03 100644 (file)
--- a/grading/userprog/Makefile
+++ b/grading/userprog/Makefile
@@ -1,12 +1,17 @@
 SRCDIR = ../../src
 
 SINGLETONS = \
+       $(addprefix args-, argc argv0 argvn single multiple dbl-space) \
+       $(addprefix sc-, bad-sp bad-arg boundary) \
+       halt exit \
        $(addprefix create-, normal empty null bad-ptr long exists bound) \
-       $(addprefix args-, argc argv0 argvn single multiple dbl-space)
+       $(addprefix open-, normal missing boundary empty null bad-ptr twice) \
+       $(addprefix close-, normal twice stdin stdout bad-fd) \
+       $(addprefix read-, normal bad-ptr boundary zero stdout bad-fd)
 
 define SINGLETON_PROG
 PROGS += $(1)
-$(1)_SRC = $(1).c
+$(subst -,_,$(1))_SRC = $(1).c
 endef
 
 $(foreach prog,$(SINGLETONS),$(eval $(call SINGLETON_PROG,$(prog))))
@@ -14,14 +19,8 @@ DISKS = $(patsubst %,%.dsk,$(PROGS))
 
 disks: $(DISKS)
 
-PINTOS = ../../src/utils/pintos
-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 $@
+       ./prep-disk $<
 
 clean::
        rm -f $(DISKS)