-TESTS = threads p1 userprog p2 vm p3 filesys p4
+TESTS = examples threads p1 userprog p2 vm p3 filesys p4
PATH := $(shell pwd)/../src/utils:$(PATH)
clean:
rm -rf $(TESTS)
-SUBMAKEFLAGS = -s
-
define mk-sandbox
rm -rf $@ && mkdir $@ && cp -R ../src $@/src
-cd $@/src && $(MAKE) clean $(SUBMAKEFLAGS)
+cd $@/src && $(MAKE) -s clean
endef
define run-tests
-cd $@/src/$(PROJECT) && make check && make grade
+cd $@/src/$(PROJECT) && time $(MAKE) check
+endef
+
+define grade-tests
+cd $@/src/$(PROJECT) && $(MAKE) grade
+cd $@/src/$(PROJECT) && grep -q PERFECT build/grade
+cd $@/src/$(PROJECT) && grep -qv warning build/grade
endef
define compile
-cd $@/src/$(PROJECT) && make
+cd $@/src/$(PROJECT) && $(MAKE)
+endef
+
+define test-clean
+cd $@/src/$(PROJECT)/build && $(MAKE) clean
+cd $@/src/$(PROJECT)/build && set `find -type f` > /dev/null && test $$# = 1
endef
define clean
endef
define apply-patch
-(cd $@ && patch -p0)
+(cd $@ && patch -p0) < ../solutions/$@.patch
endef
PROJECT = $@
+p1: PROJECT = threads
+p2: PROJECT = userprog
+p3: PROJECT = vm
+p4: PROJECT = filesys
+# Tests that just compile the provided code.
threads::
$(mk-sandbox)
$(compile)
$(run-tests) TESTS=tests/threads/alarm-single
+ $(test-clean)
$(clean)
-
userprog vm filesys::
$(mk-sandbox)
$(compile)
+ $(test-clean)
$(clean)
-
-p1: PROJECT = threads
-p1::
+examples::
$(mk-sandbox)
- $(apply-patch) < ../solutions/p1.patch
- $(run-tests)
- $(clean)
-
-p2: PROJECT = userprog
-p2::
- $(mk-sandbox)
- $(apply-patch) < ../solutions/p2.patch
- $(run-tests)
- $(clean)
-
-p3: PROJECT = vm
-p3::
- $(mk-sandbox)
- $(apply-patch) < ../solutions/p3.patch
- $(run-tests)
+ $(compile)
$(clean)
-p4: PROJECT = filesys
-p4::
+# Tests for the reference solutions.
+p1 p2 p3 p4::
$(mk-sandbox)
- $(apply-patch) < ../solutions/p4.patch
+ $(apply-patch)
$(run-tests)
+ $(grade-tests)
+ $(test-clean)
$(clean)