projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed typo in mmap example
[pintos-anon]
/
tests
/
Makefile
diff --git
a/tests/Makefile
b/tests/Makefile
index b5ff710a4074914ef7424ea5f027396c2cc5cb4e..866e3642cc340ae6de8ac0d7b1298fe07e9dd04a 100644
(file)
--- a/
tests/Makefile
+++ b/
tests/Makefile
@@
-1,4
+1,4
@@
-TESTS = threads p1 userprog p2 vm p3 filesys p4
+TESTS = threads p1 userprog p2 vm p3 filesys p4
PATH := $(shell pwd)/../src/utils:$(PATH)
PATH := $(shell pwd)/../src/utils:$(PATH)
@@
-21,15
+21,18
@@
cd $@/src && $(MAKE) clean $(SUBMAKEFLAGS)
endef
define run-tests
endef
define run-tests
-cd $@/src/$(PROJECT) &&
make
check
+cd $@/src/$(PROJECT) &&
$(MAKE)
check
endef
define run-tests-grade
endef
define run-tests-grade
-cd $@/src/$(PROJECT) && make check && make grade
+cd $@/src/$(PROJECT) && $(MAKE) check
+cd $@/src/$(PROJECT) && $(MAKE) grade
+cd $@/src/$(PROJECT) && grep -q PERFECT build/grade
+cd $@/src/$(PROJECT) && grep -qv warning build/grade
endef
define compile
endef
define compile
-cd $@/src/$(PROJECT) &&
make
+cd $@/src/$(PROJECT) &&
$(MAKE)
endef
define clean
endef
define clean
@@
-53,6
+56,9
@@
userprog vm filesys::
$(compile)
$(clean)
$(compile)
$(clean)
+FAST_SIM := $(if $(shell which qemu),--qemu)
+export PINTOSOPTS
+
p1: PROJECT = threads
p1::
$(mk-sandbox)
p1: PROJECT = threads
p1::
$(mk-sandbox)
@@
-61,6
+67,7
@@
p1::
$(clean)
p2: PROJECT = userprog
$(clean)
p2: PROJECT = userprog
+p2: PINTOSOPTS = $(FAST_SIM)
p2::
$(mk-sandbox)
$(apply-patch) < ../solutions/p2.patch
p2::
$(mk-sandbox)
$(apply-patch) < ../solutions/p2.patch
@@
-68,6
+75,7
@@
p2::
$(clean)
p3: PROJECT = vm
$(clean)
p3: PROJECT = vm
+p3: PINTOSOPTS = $(FAST_SIM)
p3::
$(mk-sandbox)
$(apply-patch) < ../solutions/p3.patch
p3::
$(mk-sandbox)
$(apply-patch) < ../solutions/p3.patch
@@
-75,6
+83,7
@@
p3::
$(clean)
p4: PROJECT = filesys
$(clean)
p4: PROJECT = filesys
+p4: PINTOSOPTS = $(FAST_SIM)
p4::
$(mk-sandbox)
$(apply-patch) < ../solutions/p4.patch
p4::
$(mk-sandbox)
$(apply-patch) < ../solutions/p4.patch