projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in jitter reported by Godmar Back (BIOS wouldn't finish
[pintos-anon]
/
tests
/
Makefile
diff --git
a/tests/Makefile
b/tests/Makefile
index efea7a5078db3e7da0cb6621a588f4f0ed9b313f..c2f8b018d3ebec2830bc09b9281f542db64dd7e8 100644
(file)
--- a/
tests/Makefile
+++ b/
tests/Makefile
@@
-1,4
+1,4
@@
-TESTS =
threads p1-1 p1-2 p1-3 list stdlib userprog p2 vm filesys
+TESTS =
examples threads p1 userprog p2 vm p3 filesys p4
PATH := $(shell pwd)/../src/utils:$(PATH)
PATH := $(shell pwd)/../src/utils:$(PATH)
@@
-13,105
+13,66
@@
check:
clean:
rm -rf $(TESTS)
clean:
rm -rf $(TESTS)
-define prep-threads-grading
-endef
-
-define prep-userprog-grading
-$(MAKE) -C ../src/userprog -s
-$(MAKE) -C ../grading/userprog -s
-endef
-
-define prep-vm-grading
-$(MAKE) -C ../src/userprog -s
-$(MAKE) -C ../grading/vm -s
+define mk-sandbox
+rm -rf $@ && mkdir $@ && cp -R ../src $@/src
+cd $@/src && $(MAKE) -s clean
endef
endef
-define
prep-filesys-grading
-$(MAKE) -C ../grading/filesys -s
+define
run-tests
+cd $@/src/$(PROJECT) && time $(MAKE) check
endef
endef
-define prep-grading
-$(prep-$(PROJECT)-grading)
+define grade-tests
+cd $@/src/$(PROJECT) && $(MAKE) grade
+cd $@/src/$(PROJECT) && grep -q PERFECT build/grade
+cd $@/src/$(PROJECT) && grep -qv warning build/grade
endef
endef
-define
mk-sandbox
-rm -rf $@ && mkdir -p $@/pintos && cp -R ../src $@/pintos
+define
compile
+cd $@/src/$(PROJECT) && $(MAKE)
endef
endef
-define run-tests
-cd $@ && ../../grading/$(PROJECT)/run-tests
+define test-clean
+cd $@/src/$(PROJECT)/build && $(MAKE) clean
+cd $@/src/$(PROJECT)/build && set `find -type f` > /dev/null && test $$# = 1
endef
define clean
endef
define clean
-rm -rf $@
/pintos
+rm -rf $@
endef
define apply-patch
endef
define apply-patch
-(cd $@
/pintos && patch -p0 -s) <
+(cd $@
&& patch -p0) < ../solutions/$@.patch
endef
endef
-threads: PROJECT = threads
-threads::
- $(mk-sandbox)
- $(run-tests) -d alarm-single
- $(clean)
-
-p1-1: PROJECT = threads
-p1-1::
- $(mk-sandbox)
- $(apply-patch) ../solutions/p1-1.patch
- $(run-tests) -d alarm.*
- $(clean)
-
-p1-2: PROJECT = threads
-p1-2::
- $(mk-sandbox)
- $(apply-patch) ../solutions/p1-2.patch
- $(run-tests) -d join.*
- $(clean)
+PROJECT = $@
+p1: PROJECT = threads
+p2: PROJECT = userprog
+p3: PROJECT = vm
+p4: PROJECT = filesys
-p1-3: PROJECT = threads
-
p1-3
::
+# Tests that just compile the provided code.
+
threads
::
$(mk-sandbox)
$(mk-sandbox)
- $(apply-patch) ../solutions/p1-3.patch
- $(run-tests) -d priority.*
+ $(compile)
+ $(run-tests) TESTS=tests/threads/alarm-single
+ $(test-clean)
$(clean)
$(clean)
-
-list: PROJECT = threads
-list stdlib::
+userprog vm filesys::
$(mk-sandbox)
$(mk-sandbox)
- 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
+ $(compile)
+ $(test-clean)
$(clean)
$(clean)
-
-userprog: PROJECT = userprog
-userprog::
- $(prep-grading)
+examples::
$(mk-sandbox)
$(mk-sandbox)
- $(apply-patch) ../solutions/p1-2.patch
- $(run-tests) null
+ $(compile)
$(clean)
$(clean)
-p2: PROJECT = userprog
-p2::
- $(prep-grading)
+# Tests for the reference solutions.
+p1 p2 p3 p4::
$(mk-sandbox)
$(mk-sandbox)
- $(apply-patch)
../solutions/p2.patch
+ $(apply-patch)
$(run-tests)
$(run-tests)
- $(clean)
-
-vm: PROJECT = vm
-vm::
- $(prep-grading)
- $(mk-sandbox)
- $(MAKE) -C $@/pintos/src/vm -s
- $(clean)
-
-filesys: PROJECT = filesys
-filesys::
- $(prep-grading)
- $(mk-sandbox)
- $(MAKE) -C $@/pintos/src/filesys -s
+ $(grade-tests)
+ $(test-clean)
$(clean)
$(clean)