projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more tests.
[pintos-anon]
/
grading
/
userprog
/
Makefile
diff --git
a/grading/userprog/Makefile
b/grading/userprog/Makefile
index a928b97003a2edb7ae096fea380733117f72fb19..25ba85759b7e0bbfab6354f8f4eb72adbd67950b 100644
(file)
--- a/
grading/userprog/Makefile
+++ b/
grading/userprog/Makefile
@@
-1,6
+1,8
@@
SRCDIR = ../../src
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)
define SINGLETON_PROG
PROGS += $(1)
@@
-13,17
+15,17
@@
DISKS = $(patsubst %,%.dsk,$(PROGS))
disks: $(DISKS)
PINTOS = ../../src/utils/pintos
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
clean::
rm -f $(DISKS)
include $(SRCDIR)/Makefile.userprog
+
+CFLAGS += -Werror