X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2FMakefile;h=ce215b3fd00247464df04e20264e2cd663fe99c6;hb=0c1ab0359b2313d6238659608dd84935015d8ec7;hp=f813f7de92a1206dfbd157e4a8690e563df92df7;hpb=0b03e95ba4a5ca2c936a98d77caee8f6f4087529;p=pintos-anon

diff --git a/tests/Makefile b/tests/Makefile
index f813f7d..ce215b3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-TESTS = threads p1-1 p1-2 p1-3 list stdlib userprog p2 vm filesys
+TESTS = threads p1-1 p1-2 list stdlib stdio userprog p2 vm filesys
 
 PATH := $(shell pwd)/../src/utils:$(PATH)
 
@@ -67,18 +67,11 @@ 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)
 
 list: PROJECT = threads
-list stdlib::
+list stdlib stdio::
 	$(mk-sandbox)
 	cp ../src/tests/threads/$@.c $@/pintos/src/threads/test.c
 	$(MAKE) -C $@/pintos/src/threads -s
@@ -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)