Add timeouts.

[pintos-anon] / src / tests / vm / Make.tests

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