X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fvm%2FMake.tests;h=a2427a165f799cc5b5fbfbfd31de3fced4864d6f;hb=3146439436229fe48e325caa9a140d05d8ac2897;hp=ed1d14a02c16b2c230d3e69d080016d787447e0b;hpb=a3e43e91fae97bbdef2a09823e819c1f6950cc32;p=pintos-anon

diff --git a/src/tests/vm/Make.tests b/src/tests/vm/Make.tests
index ed1d14a..a2427a1 100644
--- a/src/tests/vm/Make.tests
+++ b/src/tests/vm/Make.tests
@@ -1,14 +1,12 @@
 # -*- makefile -*-
 
-PINTOSFLAGS += --swap-disk=4
-
 tests/vm_TESTS = $(addprefix tests/vm/,pt-grow-stack pt-grow-pusha	\
 pt-grow-bad pt-big-stk-obj pt-bad-addr pt-bad-read pt-write-code	\
-pt-write-code2 page-linear page-parallel page-merge-seq page-merge-par	\
-page-shuffle mmap-read mmap-close mmap-unmap mmap-overlap mmap-twice	\
-mmap-write mmap-exit mmap-shuffle mmap-bad-fd mmap-clean mmap-inherit	\
-mmap-misalign mmap-null mmap-over-code mmap-over-data mmap-over-stk	\
-mmap-remove mmap-zero)
+pt-write-code2 pt-grow-stk-sc page-linear page-parallel page-merge-seq	\
+page-merge-par page-shuffle mmap-read mmap-close mmap-unmap		\
+mmap-overlap mmap-twice mmap-write mmap-exit mmap-shuffle mmap-bad-fd	\
+mmap-clean mmap-inherit mmap-misalign mmap-null mmap-over-code		\
+mmap-over-data mmap-over-stk mmap-remove mmap-zero)
 
 tests/vm_PROGS = $(tests/vm_TESTS) $(addprefix tests/vm/,child-linear	\
 child-sort child-mm-wrt child-inherit)
@@ -24,6 +22,7 @@ tests/vm/pt-bad-addr_SRC = tests/vm/pt-bad-addr.c tests/lib.c tests/main.c
 tests/vm/pt-bad-read_SRC = tests/vm/pt-bad-read.c tests/lib.c tests/main.c
 tests/vm/pt-write-code_SRC = tests/vm/pt-write-code.c tests/lib.c tests/main.c
 tests/vm/pt-write-code2_SRC = tests/vm/pt-write-code-2.c tests/lib.c tests/main.c
+tests/vm/pt-grow-stk-sc_SRC = tests/vm/pt-grow-stk-sc.c tests/lib.c tests/main.c
 tests/vm/page-linear_SRC = tests/vm/page-linear.c tests/arc4.c	\
 tests/lib.c tests/main.c
 tests/vm/page-parallel_SRC = tests/vm/page-parallel.c tests/lib.c tests/main.c
@@ -81,14 +80,14 @@ 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-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-linear.output: TIMEOUT = 300
+tests/vm/page-shuffle.output: TIMEOUT = 600
+tests/vm/mmap-shuffle.output: TIMEOUT = 600
+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
 
-
-
-
+clean::
+	rm -f tests/vm/zeros