- adjustments to scores for P3 as discussed.

- increased problem size for page-* tests to force eviction

diff --git a/src/tests/vm/Grading b/src/tests/vm/Grading
index cb8d7cb6822d3e32e5c82aefea6c6fa9f0d9c791..f0c2c13251154fc10c08090c0f2120b2c84847c3 100644 (file)
--- a/src/tests/vm/Grading
+++ b/src/tests/vm/Grading
@@ -5,8 +5,8 @@
 # functionality should work too, and it's easy to screw it up, thus
 # the equal weight placed on each.
 
-25%    tests/vm/Rubric.functionality
-25%    tests/vm/Rubric.robustness
-12.5%  tests/userprog/Rubric.functionality
-12.5%  tests/userprog/Rubric.robustness
-25%    tests/filesys/base/Rubric
+50%    tests/vm/Rubric.functionality
+15%    tests/vm/Rubric.robustness
+10%    tests/userprog/Rubric.functionality
+5%     tests/userprog/Rubric.robustness
+20%    tests/filesys/base/Rubric

diff --git a/src/tests/vm/Rubric.functionality b/src/tests/vm/Rubric.functionality
index 8338e7fd22fe682852ebc470a02f9acd10022d59..8a8661290c6e31a1937418ea0d5b33b1038b18ab 100644 (file)
--- a/src/tests/vm/Rubric.functionality
+++ b/src/tests/vm/Rubric.functionality
@@ -1,18 +1,18 @@
 Functionality of virtual memory subsystem:
-- Test page table.
-4      pt-grow-stack
-2      pt-grow-stk-sc
-6      pt-big-stk-obj
-6      pt-grow-pusha
+- Test stack growth.
+3      pt-grow-stack
+3      pt-grow-stk-sc
+3      pt-big-stk-obj
+3      pt-grow-pusha
 
 - Test paging behavior.
-2      page-linear
+3      page-linear
 3      page-parallel
 3      page-shuffle
-5      page-merge-seq
-5      page-merge-par
-5      page-merge-mm
-5      page-merge-stk
+4      page-merge-seq
+4      page-merge-par
+4      page-merge-mm
+4      page-merge-stk
 
 - Test "mmap" system call.
 2      mmap-read

diff --git a/src/tests/vm/child-linear.c b/src/tests/vm/child-linear.c
index 7515e4ebf2bc9f6e15e10a48e4b1b69ea95cb8c8..eca3e3f5a19dac0305319104ae15f5e8cb0e7ea5 100644 (file)
--- a/src/tests/vm/child-linear.c
+++ b/src/tests/vm/child-linear.c
@@ -1,5 +1,5 @@
 /* Child process of page-parallel.
-   Encrypts 128 kB of zeros, then decrypts it, and ensures that
+   Encrypts 1 MB of zeros, then decrypts it, and ensures that
    the zeros are back. */
 
 #include <string.h>
@@ -9,7 +9,7 @@
 
 const char *test_name = "child-linear";
 
-#define SIZE (128 * 1024)
+#define SIZE (1024 * 1024)
 static char buf[SIZE];
 
 int

diff --git a/src/tests/vm/page-linear.c b/src/tests/vm/page-linear.c
index 12375a7774231c7a083e7ec3a8fcb311f2caae08..652a47b36c8e83e203b9dfe968b1aae67a113fcb 100644 (file)
--- a/src/tests/vm/page-linear.c
+++ b/src/tests/vm/page-linear.c
@@ -1,4 +1,4 @@
-/* Encrypts, then decrypts, 1 MB of memory and verifies that the
+/* Encrypts, then decrypts, 2 MB of memory and verifies that the
    values are as they should be. */
 
 #include <string.h>
@@ -6,7 +6,7 @@
 #include "tests/lib.h"
 #include "tests/main.h"
 
-#define SIZE (1024 * 1024)
+#define SIZE (2 * 1024 * 1024)
 
 static char buf[SIZE];
 

diff --git a/src/tests/vm/page-parallel.c b/src/tests/vm/page-parallel.c
index 69ec619a23665539d24a58a3f508dd4240dfd048..9d619e0d644de8b7342f1300a9829a068eb14e86 100644 (file)
--- a/src/tests/vm/page-parallel.c
+++ b/src/tests/vm/page-parallel.c
@@ -1,10 +1,10 @@
-/* Runs 3 child-linear processes at once. */
+/* Runs 4 child-linear processes at once. */
 
 #include <syscall.h>
 #include "tests/lib.h"
 #include "tests/main.h"
 
-#define CHILD_CNT 3
+#define CHILD_CNT 4
 
 void
 test_main (void)

diff --git a/src/tests/vm/page-parallel.ck b/src/tests/vm/page-parallel.ck
index c6817b7657c1f5f95d3fe55176c3adca51ed2d9c..90c14ef035e6e1a0db6d017c970bf9b179045ab8 100644 (file)
--- a/src/tests/vm/page-parallel.ck
+++ b/src/tests/vm/page-parallel.ck
@@ -7,9 +7,11 @@ check_expected (IGNORE_EXIT_CODES => 1, [<<'EOF']);
 (page-parallel) exec "child-linear"
 (page-parallel) exec "child-linear"
 (page-parallel) exec "child-linear"
+(page-parallel) exec "child-linear"
 (page-parallel) wait for child 0
 (page-parallel) wait for child 1
 (page-parallel) wait for child 2
+(page-parallel) wait for child 3
 (page-parallel) end
 EOF
 pass;