From: Ben Pfaff Date: Sun, 9 Jan 2005 01:10:35 +0000 (+0000) Subject: Add self-test. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94e2e63b24a901da641f5c68cf46ce00681f5dd1;p=pintos-anon Add self-test. --- diff --git a/Makefile b/Makefile index de9eb1a..d1eab01 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBDIRS = src grading doc +SUBDIRS = src grading doc tests all:: @echo "This makefile has only 'clean' targets." @@ -8,3 +8,6 @@ clean:: distclean:: clean find . -name '*~' -exec rm '{}' \; + +check:: + make -C tests $@ diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..b084e95 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,113 @@ +TESTS = threads p1-1 p1-2 p1-3 list stdlib userprog p2 vm filesys + +check: + $(MAKE) -C .. distclean + for d in $(TESTS); do $(MAKE) $$d || exit 1; done + @echo All tests passed. + +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 +endef + +define prep-filesys-grading +$(MAKE) -C ../grading/filesys -s +endef + +define prep-grading +$(prep-$(PROJECT)-grading) +endef + +define mk-sandbox +rm -rf $@ && mkdir -p $@/pintos && cp -R ../src $@/pintos +endef + +define run-tests +cd $@ && ../../grading/$(PROJECT)/run-tests +endef + +define clean +rm -rf $@/pintos +endef + +define apply-patch +(cd $@/pintos && patch -p0 -s) < +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) + +p1-3: PROJECT = threads +p1-3:: + $(mk-sandbox) + $(apply-patch) ../solutions/p1-3.patch + $(run-tests) -d priority.* + $(clean) + +list: PROJECT = threads +list stdlib:: + $(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 && ! grep -q 'FAIL' $@/output + $(clean) + +userprog: PROJECT = userprog +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) + +p2: PROJECT = userprog +p2:: + $(prep-grading) + $(mk-sandbox) + $(apply-patch) ../solutions/p2.patch + $(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 + $(clean)