X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fvm%2FMake.tests;h=c519efbffa10ab806ae104e9f7cdbed2f59b796c;hb=fd4478592855e4cfea39f9797231fd7ba0ff01c4;hp=1c2257b116e18d9b901c00fd819f8b57769c0a82;hpb=5069406f364ec47bbfd52bd11e896176134a8e2f;p=pintos-anon

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