Add stdio test.

[pintos-anon] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index b084e95bae2e72ef954c763a4ae968701472f100..ce215b3fd00247464df04e20264e2cd663fe99c6 100644 (file)
--- 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 stdio userprog p2 vm filesys
+
+PATH := $(shell pwd)/../src/utils:$(PATH)
+
+all:
+       @echo "This Makefile has only \`check' targets."
 
 check:
        $(MAKE) -C .. distclean
@@ -62,31 +67,23 @@ 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
        -(cd $@/pintos/src/threads/build && pintos -v run -q) | tee $@/output
-       grep -q '$@: PASS' $@/output && ! grep -q 'FAIL' $@/output
+       grep -q '$@: PASS' $@/output
        $(clean)
 
 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)