X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2FMakefile;h=5d53e286b71c3e49a657e19350003631d8dfba8f;hb=a26618d6f33f13301eb93ee26d6953c76019d879;hp=b5ff710a4074914ef7424ea5f027396c2cc5cb4e;hpb=5069406f364ec47bbfd52bd11e896176134a8e2f;p=pintos-anon

diff --git a/tests/Makefile b/tests/Makefile
index b5ff710..5d53e28 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-TESTS = threads p1 userprog p2 vm p3 filesys p4
+TESTS = threads p1 userprog p2 vm p3 filesys p4 
 
 PATH := $(shell pwd)/../src/utils:$(PATH)
 
@@ -13,23 +13,23 @@ check:
 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
+cd $@/src/$(PROJECT) && $(MAKE) check PINTOSOPTS=$(PINTOSOPTS)
 endef
 
-define run-tests-grade
-cd $@/src/$(PROJECT) && make check && make grade
+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 clean
@@ -37,46 +37,31 @@ rm -rf $@
 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
 	$(clean)
-
 userprog vm filesys::
 	$(mk-sandbox)
 	$(compile)
 	$(clean)
 
-p1: PROJECT = threads
-p1::
-	$(mk-sandbox)
-	$(apply-patch) < ../solutions/p1.patch
-	$(run-tests-grade)
-	$(clean)
-
-p2: PROJECT = userprog
-p2::
-	$(mk-sandbox)
-	$(apply-patch) < ../solutions/p2.patch
-	$(run-tests-grade)
-	$(clean)
-
-p3: PROJECT = vm
-p3::
-	$(mk-sandbox)
-	$(apply-patch) < ../solutions/p3.patch
-	$(run-tests-grade)
-	$(clean)
-
-p4: PROJECT = filesys
-p4::
+# Tests for the reference solutions.
+p2 p3 p4: PINTOSOPTS = --qemu
+p1 p2 p3 p4::
 	$(mk-sandbox)
-	$(apply-patch) < ../solutions/p4.patch
-	$(run-tests-grade)
+	$(apply-patch)
+	$(run-tests)
+	$(grade-tests)
 	$(clean)