X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2FMakefile;h=705472f8aa420b5dbd944bde9e795270c8c38db7;hb=bfa424a4845832236576c518db42882609f80a5b;hp=be8b0d552648438dae7e86818fd05e3122003ea0;hpb=615bf3b3d2a8573ed6fb9ddc0055745e163ac999;p=pintos-anon

diff --git a/tests/Makefile b/tests/Makefile
index be8b0d5..705472f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -21,11 +21,18 @@ cd $@/src && $(MAKE) clean $(SUBMAKEFLAGS)
 endef
 
 define run-tests
-cd $@/src/$(PROJECT) && make check
+cd $@/src/$(PROJECT) && $(MAKE) check
+endef
+
+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 compile
-cd $@/src/$(PROJECT) && make
+cd $@/src/$(PROJECT) && $(MAKE)
 endef
 
 define clean
@@ -49,30 +56,36 @@ userprog vm filesys::
 	$(compile)
 	$(clean)
 
+FAST_SIM := $(if $(shell which qemu),--qemu)
+export PINTOSOPTS
+
 p1: PROJECT = threads
 p1::
 	$(mk-sandbox)
 	$(apply-patch) < ../solutions/p1.patch
-	$(run-tests)
+	$(run-tests-grade)
 	$(clean)
 
 p2: PROJECT = userprog
+p2: PINTOSOPTS = $(FAST_SIM)
 p2::
 	$(mk-sandbox)
 	$(apply-patch) < ../solutions/p2.patch
-	$(run-tests)
+	$(run-tests-grade)
 	$(clean)
 
 p3: PROJECT = vm
+p3: PINTOSOPTS = $(FAST_SIM)
 p3::
 	$(mk-sandbox)
 	$(apply-patch) < ../solutions/p3.patch
-	$(run-tests)
+	$(run-tests-grade)
 	$(clean)
 
 p4: PROJECT = filesys
+p4: PINTOSOPTS = $(FAST_SIM)
 p4::
 	$(mk-sandbox)
 	$(apply-patch) < ../solutions/p4.patch
-	$(run-tests)
+	$(run-tests-grade)
 	$(clean)