From: Ben Pfaff Date: Mon, 20 Jun 2005 20:59:12 +0000 (+0000) Subject: Add timeouts. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e07abed6f083b5ada83c3f5082707e21c3d1399;p=pintos-anon Add timeouts. --- diff --git a/src/tests/Make.tests b/src/tests/Make.tests index b60243f..00b9097 100644 --- a/src/tests/Make.tests +++ b/src/tests/Make.tests @@ -7,8 +7,11 @@ TESTS = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_TESTS)) include ../../Makefile.userprog -PINTOSFLAGS += -v $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file))) +TIMEOUT = 60 +PINTOSFLAGS += -v -T $(TIMEOUT) \ + $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file))) KERNELFLAGS += -q + PINTOS = pintos $(PINTOSOPTS) $(PINTOSFLAGS) -- $(KERNELFLAGS) OUTPUTS = $(addsuffix .output,$(TESTS)) diff --git a/src/tests/threads/Make.tests b/src/tests/threads/Make.tests index 64b9ef3..d59d5c4 100644 --- a/src/tests/threads/Make.tests +++ b/src/tests/threads/Make.tests @@ -28,11 +28,16 @@ tests/threads_SRC += tests/threads/mlfqs-load-avg.c tests/threads_SRC += tests/threads/mlfqs-recent-1.c tests/threads_SRC += tests/threads/mlfqs-fair.c -tests/threads/mlfqs-load-1.output \ -tests/threads/mlfqs-load-60.output \ -tests/threads/mlfqs-load-avg.output \ -tests/threads/mlfqs-recent-1.output \ -tests/threads/mlfqs-fair-2.output \ -tests/threads/mlfqs-fair-20.output \ -tests/threads/mlfqs-nice-2.output \ -tests/threads/mlfqs-nice-10.output: KERNELFLAGS += -mlfqs +MLFQS_OUTPUTS = \ +tests/threads/mlfqs-load-1.output \ +tests/threads/mlfqs-load-60.output \ +tests/threads/mlfqs-load-avg.output \ +tests/threads/mlfqs-recent-1.output \ +tests/threads/mlfqs-fair-2.output \ +tests/threads/mlfqs-fair-20.output \ +tests/threads/mlfqs-nice-2.output \ +tests/threads/mlfqs-nice-10.output + +$(MLFQS_OUTPUTS): KERNELFLAGS += -mlfqs +$(MLFQS_OUTPUTS): TIMEOUT = 240 + diff --git a/src/tests/userprog/no-vm/Make.tests b/src/tests/userprog/no-vm/Make.tests index 68ea197..7aaa53a 100644 --- a/src/tests/userprog/no-vm/Make.tests +++ b/src/tests/userprog/no-vm/Make.tests @@ -6,4 +6,4 @@ tests/userprog/no-vm/multi-oom_SRC = tests/userprog/no-vm/multi-oom.c \ tests/lib.c tests/userprog/no-vm/multi-oom_ARGS = 0 - +tests/userprog/no-vm/multi-oom.output: TIMEOUT = 180 diff --git a/src/tests/vm/Make.tests b/src/tests/vm/Make.tests index 1c2257b..c519efb 100644 --- a/src/tests/vm/Make.tests +++ b/src/tests/vm/Make.tests @@ -81,6 +81,9 @@ tests/vm/mmap-over-data_PUTFILES = tests/vm/sample.txt tests/vm/mmap-over-stk_PUTFILES = tests/vm/sample.txt tests/vm/mmap-remove_PUTFILES = tests/vm/sample.txt +tests/vm/page-merge-seq.output: TIMEOUT = 300 +tests/vm/page-merge-par.output: TIMEOUT = 300 + tests/vm/zeros: dd if=/dev/zero of=$@ bs=1024 count=6