Get rid of THREAD_JOIN_IMPLEMENTED by adding thread_join() stub.

[pintos-anon] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index b084e95bae2e72ef954c763a4ae968701472f100..efea7a5078db3e7da0cb6621a588f4f0ed9b313f 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,10 @@
 TESTS = threads p1-1 p1-2 p1-3 list stdlib userprog p2 vm filesys
 
+PATH := $(shell pwd)/../src/utils:$(PATH)
+
+all:
+       @echo "This Makefile has only \`check' targets."
+
 check:
        $(MAKE) -C .. distclean
        for d in $(TESTS); do $(MAKE) $$d || exit 1; done
@@ -78,7 +83,7 @@ list stdlib::
        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
@@ -86,7 +91,6 @@ userprog::
        $(prep-grading)
        $(mk-sandbox)
        $(apply-patch) ../solutions/p1-2.patch
-       echo '#define THREAD_JOIN_IMPLEMENTED 1' > $@/pintos/src/constants.h
        $(run-tests) null
        $(clean)