Apply appropriate changes from main branch to bring win0405-branch up

[pintos-anon] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index efea7a5078db3e7da0cb6621a588f4f0ed9b313f..4bdd5977703616563a802edd382f0f7f9667764d 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,6 +7,9 @@ all:
 
 check:
        $(MAKE) -C .. distclean
+       $(MAKE) check-noclean
+
+check-noclean:
        for d in $(TESTS); do $(MAKE) $$d || exit 1; done
        @echo All tests passed.
 
@@ -91,6 +94,7 @@ 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)