projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move problem 1-2 (join) into project 2 as the "wait" system call.
[pintos-anon]
/
tests
/
Makefile
diff --git
a/tests/Makefile
b/tests/Makefile
index e6a9c98b4f13c7fe73946825afc5ac20d71d70ad..2450e563b6d2cc0ee24f206dfcb5d4dee0a35dfe 100644
(file)
--- a/
tests/Makefile
+++ b/
tests/Makefile
@@
-1,7
+1,10
@@
-TESTS = threads p1-1 p1-2
p1-3
list stdlib userprog p2 vm filesys
+TESTS = threads p1-1 p1-2 list stdlib userprog p2 vm filesys
PATH := $(shell pwd)/../src/utils:$(PATH)
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
check:
$(MAKE) -C .. distclean
for d in $(TESTS); do $(MAKE) $$d || exit 1; done
@@
-64,13
+67,6
@@
p1-2: PROJECT = threads
p1-2::
$(mk-sandbox)
$(apply-patch) ../solutions/p1-2.patch
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)
$(run-tests) -d priority.*
$(clean)
@@
-87,8
+83,7
@@
userprog: PROJECT = userprog
userprog::
$(prep-grading)
$(mk-sandbox)
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)
$(run-tests) null
$(clean)