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

[pintos-anon] / tests / Makefile

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