X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fvm%2FMake.tests;h=d01a613639a298e31e10851f620f71143d36a476;hb=81000837935d5b094d6919a266cd9441874c721b;hp=19be5b9288801c5a8956a1dd40a9dfc75c912dac;hpb=d2a3bdc8c5dff67922c51308607c6c3e8ab5b802;p=pintos-anon

diff --git a/src/tests/vm/Make.tests b/src/tests/vm/Make.tests
index 19be5b9..d01a613 100644
--- a/src/tests/vm/Make.tests
+++ b/src/tests/vm/Make.tests
@@ -84,8 +84,8 @@ tests/vm/mmap-remove_PUTFILES = tests/vm/sample.txt
 tests/vm/page-linear.output: TIMEOUT = 300
 tests/vm/page-shuffle.output: TIMEOUT = 300
 tests/vm/mmap-shuffle.output: TIMEOUT = 300
-tests/vm/page-merge-seq.output: TIMEOUT = 300
-tests/vm/page-merge-par.output: TIMEOUT = 300
+tests/vm/page-merge-seq.output: TIMEOUT = 600
+tests/vm/page-merge-par.output: TIMEOUT = 600
 
 tests/vm/zeros:
 	dd if=/dev/zero of=$@ bs=1024 count=6