X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Ftests%2Fvm%2FMake.tests;h=04b1b81666ac0407ffd05a7157048eabc6e6f911;hp=a2427a165f799cc5b5fbfbfd31de3fced4864d6f;hb=7eb9f6e1fa81807ee7cc381047077f8ff98d1d68;hpb=e73c27897259e2c4fb340406f01491278134803a

diff --git a/src/tests/vm/Make.tests b/src/tests/vm/Make.tests
index a2427a1..04b1b81 100644
--- a/src/tests/vm/Make.tests
+++ b/src/tests/vm/Make.tests
@@ -3,13 +3,14 @@
 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 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)
+page-merge-par page-merge-stk page-merge-mm 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)
+child-sort child-qsort child-qsort-mm child-mm-wrt child-inherit)
 
 tests/vm/pt-grow-stack_SRC = tests/vm/pt-grow-stack.c tests/arc4.c	\
 tests/cksum.c tests/lib.c tests/main.c
@@ -28,8 +29,12 @@ tests/lib.c tests/main.c
 tests/vm/page-parallel_SRC = tests/vm/page-parallel.c tests/lib.c tests/main.c
 tests/vm/page-merge-seq_SRC = tests/vm/page-merge-seq.c tests/arc4.c	\
 tests/lib.c tests/main.c
-tests/vm/page-merge-par_SRC = tests/vm/page-merge-par.c tests/arc4.c	\
-tests/lib.c tests/main.c
+tests/vm/page-merge-par_SRC = tests/vm/page-merge-par.c \
+tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
+tests/vm/page-merge-stk_SRC = tests/vm/page-merge-stk.c \
+tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
+tests/vm/page-merge-mm_SRC = tests/vm/page-merge-mm.c \
+tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
 tests/vm/page-shuffle_SRC = tests/vm/page-shuffle.c tests/arc4.c	\
 tests/cksum.c tests/lib.c tests/main.c
 tests/vm/mmap-read_SRC = tests/vm/mmap-read.c tests/lib.c tests/main.c
@@ -56,6 +61,9 @@ tests/vm/mmap-remove_SRC = tests/vm/mmap-remove.c tests/lib.c tests/main.c
 tests/vm/mmap-zero_SRC = tests/vm/mmap-zero.c tests/lib.c tests/main.c
 
 tests/vm/child-linear_SRC = tests/vm/child-linear.c tests/arc4.c tests/lib.c
+tests/vm/child-qsort_SRC = tests/vm/child-qsort.c tests/vm/qsort.c tests/lib.c
+tests/vm/child-qsort-mm_SRC = tests/vm/child-qsort-mm.c tests/vm/qsort.c \
+tests/lib.c
 tests/vm/child-sort_SRC = tests/vm/child-sort.c tests/lib.c
 tests/vm/child-mm-wrt_SRC = tests/vm/child-mm-wrt.c tests/lib.c tests/main.c
 tests/vm/child-inherit_SRC = tests/vm/child-inherit.c tests/lib.c tests/main.c
@@ -71,6 +79,8 @@ tests/vm/mmap-exit_PUTFILES = tests/vm/child-mm-wrt
 tests/vm/page-parallel_PUTFILES = tests/vm/child-linear
 tests/vm/page-merge-seq_PUTFILES = tests/vm/child-sort
 tests/vm/page-merge-par_PUTFILES = tests/vm/child-sort
+tests/vm/page-merge-stk_PUTFILES = tests/vm/child-qsort
+tests/vm/page-merge-mm_PUTFILES = tests/vm/child-qsort-mm
 tests/vm/mmap-clean_PUTFILES = tests/vm/sample.txt
 tests/vm/mmap-inherit_PUTFILES = tests/vm/sample.txt tests/vm/child-inherit
 tests/vm/mmap-misalign_PUTFILES = tests/vm/sample.txt