X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2FMakefile;h=2450e563b6d2cc0ee24f206dfcb5d4dee0a35dfe;hb=15aa248a41556196803c75cb4f56ddad05f5d64e;hp=f7c813184e6a1eddbbeb146f343ae674f207db31;hpb=6e77241274ead3d937414d50d643ddcbb89d118d;p=pintos-anon

diff --git a/tests/Makefile b/tests/Makefile
index f7c8131..2450e56 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,9 @@
-TESTS = threads p1-1 p1-2 p1-3 list stdlib userprog p2 vm filesys
+TESTS = threads p1-1 p1-2 list stdlib userprog p2 vm filesys
+
+PATH := $(shell pwd)/../src/utils:$(PATH)
+
+all:
+	@echo "This Makefile has only \`check' targets."
 
 check:
 	$(MAKE) -C .. distclean
@@ -62,13 +67,6 @@ p1-2: PROJECT = threads
 p1-2::
 	$(mk-sandbox)
 	$(apply-patch) ../solutions/p1-2.patch
-	$(run-tests) -d join.*
-	$(clean)
-
-p1-3: PROJECT = threads
-p1-3::
-	$(mk-sandbox)
-	$(apply-patch) ../solutions/p1-3.patch
 	$(run-tests) -d priority.*
 	$(clean)
 
@@ -85,8 +83,7 @@ userprog: PROJECT = userprog
 userprog::
 	$(prep-grading)
 	$(mk-sandbox)
-	$(apply-patch) ../solutions/p1-2.patch
-	echo '#define THREAD_JOIN_IMPLEMENTED 1' > $@/pintos/src/constants.h
+	$(apply-patch) ../solutions/p2-null.patch
 	$(run-tests) null
 	$(clean)