-TESTS = threads p1-1 p1-2 list stdlib stdio userprog p2 vm filesys
+TESTS = threads p1 userprog p2 vm p3 filesys p4
PATH := $(shell pwd)/../src/utils:$(PATH)
SUBMAKEFLAGS = -s
-define prep-threads-grading
-endef
-
-define prep-userprog-grading
-$(MAKE) -C ../src/userprog $(SUBMAKEFLAGS)
-$(MAKE) -C ../grading/userprog $(SUBMAKEFLAGS)
-endef
-
-define prep-vm-grading
-$(MAKE) -C ../src/userprog $(SUBMAKEFLAGS)
-$(MAKE) -C ../grading/vm $(SUBMAKEFLAGS)
-endef
-
-define prep-filesys-grading
-$(MAKE) -C ../grading/filesys $(SUBMAKEFLAGS)
+define mk-sandbox
+rm -rf $@ && mkdir $@ && cp -R ../src $@/src
+cd $@/src && $(MAKE) clean $(SUBMAKEFLAGS)
endef
-define prep-grading
-$(prep-$(PROJECT)-grading)
+define run-tests
+cd $@/src/$(PROJECT) && $(MAKE) check
endef
-define mk-sandbox
-rm -rf $@ && mkdir -p $@/pintos && cp -R ../src $@/pintos
-cd $@/pintos/src && $(MAKE) clean $(SUBMAKEFLAGS)
+define run-tests-grade
+cd $@/src/$(PROJECT) && $(MAKE) check
+cd $@/src/$(PROJECT) && $(MAKE) grade
+cd $@/src/$(PROJECT) && grep -q PERFECT build/grade
+cd $@/src/$(PROJECT) && ! grep -q warning build/grade
endef
-define run-tests
-cd $@ && ../../grading/$(PROJECT)/run-tests
+define compile
+cd $@/src/$(PROJECT) && $(MAKE)
endef
define clean
endef
define apply-patch
-(cd $@/pintos && patch -p0)
+(cd $@ && patch -p0)
endef
-threads: PROJECT = threads
-threads::
- $(mk-sandbox)
- $(run-tests) -d alarm-single
- $(clean)
+PROJECT = $@
-p1-1: PROJECT = threads
-p1-1::
+threads::
$(mk-sandbox)
- $(apply-patch) < ../solutions/p1-1.patch
- $(run-tests) -d alarm.*
+ $(compile)
+ $(run-tests) TESTS=tests/threads/alarm-single
$(clean)
-p1-2: PROJECT = threads
-p1-2::
+userprog vm filesys::
$(mk-sandbox)
- $(apply-patch) < ../solutions/p1-2.patch
- $(run-tests) -d priority.*
+ $(compile)
$(clean)
-list: PROJECT = threads
-list stdlib stdio::
- $(mk-sandbox)
- cp ../src/tests/threads/$@.c $@/pintos/src/threads/test.c
- $(MAKE) -C $@/pintos/src/threads $(SUBMAKEFLAGS)
- -(cd $@/pintos/src/threads/build && pintos -v run -q) | tee $@/output
- grep -q '$@: PASS' $@/output
- $(clean)
+FAST_SIM := $(if $(shell which qemu),--qemu)
+export PINTOSOPTS
-userprog: PROJECT = userprog
-userprog::
- $(prep-grading) null.dsk
+p1: PROJECT = threads
+p1::
$(mk-sandbox)
- $(apply-patch) < ../solutions/p2-null.patch
- $(run-tests) null
+ $(apply-patch) < ../solutions/p1.patch
+ $(run-tests-grade)
$(clean)
p2: PROJECT = userprog
+p2: PINTOSOPTS = $(FAST_SIM)
p2::
- $(prep-grading)
$(mk-sandbox)
$(apply-patch) < ../solutions/p2.patch
- $(run-tests)
+ $(run-tests-grade)
$(clean)
-vm: PROJECT = vm
-vm::
- $(prep-grading)
+p3: PROJECT = vm
+p3: PINTOSOPTS = $(FAST_SIM)
+p3::
$(mk-sandbox)
- $(MAKE) -C $@/pintos/src/vm $(SUBMAKEFLAGS)
+ $(apply-patch) < ../solutions/p3.patch
+ $(run-tests-grade)
$(clean)
-filesys: PROJECT = filesys
-filesys::
- $(prep-grading)
+p4: PROJECT = filesys
+p4: PINTOSOPTS = $(FAST_SIM)
+p4::
$(mk-sandbox)
- $(MAKE) -C $@/pintos/src/filesys $(SUBMAKEFLAGS)
+ $(apply-patch) < ../solutions/p4.patch
+ $(run-tests-grade)
$(clean)