Add timeouts.

diff --git a/src/tests/Make.tests b/src/tests/Make.tests
index b60243f5c6bc7640fd2bc32bfa03c1833cbdaa7b..00b9097c8420b7bd2ddf2f22b019f9f0a4cac757 100644 (file)
--- 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 64b9ef3fd2421fce7aa73030e0277a4c5e19fed3..d59d5c49a69620c987c18632ce952e2f92522c54 100644 (file)
--- 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 68ea1973a6a5a3bf2379ca94e900c1138fe4ffc4..7aaa53af705a0ed64bf05eab4bd0736c00102baf 100644 (file)
--- 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 1c2257b116e18d9b901c00fd819f8b57769c0a82..c519efbffa10ab806ae104e9f7cdbed2f59b796c 100644 (file)
--- 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