X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2FMakefile;h=2450e563b6d2cc0ee24f206dfcb5d4dee0a35dfe;hb=2cfc156c39840ce7f1cda6b473de1322691a8a0b;hp=af04b414c667e9520a6d1943b5e32a69cd1a4105;hpb=5a121c17dc3088074ff51b99dbe353b25e7adff1;p=pintos-anon

diff --git a/tests/Makefile b/tests/Makefile
index af04b41..2450e56 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,9 +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.
+	@echo "This Makefile has only \`check' targets."
 
 check:
 	$(MAKE) -C .. distclean
@@ -67,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)
 
@@ -90,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)