adjusted scores for P4 as discussed

diff --git a/src/tests/filesys/Grading.no-vm b/src/tests/filesys/Grading.no-vm
index d7c39449e90f858f7e17fb8fe8b25a326a228e5e..ee98fc1f2827b320940e27d90e399b9f98e48396 100644 (file)
--- a/src/tests/filesys/Grading.no-vm
+++ b/src/tests/filesys/Grading.no-vm
@@ -1,18 +1,18 @@
-# Precentage of the testing point total designated for each set of
+# Percentage of the testing point total designated for each set of
 # tests.
 
 # This project is primarily about implementing the file system, but
 # all the previous functionality should work too.  It's not too easy
 # to screw it up, thus the emphasis.
 
-# 50% for extended file system features.
-16.7%  tests/filesys/extended/Rubric.functionality
-16.7%  tests/filesys/extended/Rubric.robustness
-16.6%  tests/filesys/extended/Rubric.persistence
+# 65% for extended file system features.
+30%    tests/filesys/extended/Rubric.functionality
+15%    tests/filesys/extended/Rubric.robustness
+20%    tests/filesys/extended/Rubric.persistence
 
-# 25% to not break the provided file system features.
-25%    tests/filesys/base/Rubric
+# 20% to not break the provided file system features.
+20%    tests/filesys/base/Rubric
 
-# 25% for the rest.
-12.5%  tests/userprog/Rubric.functionality
-12.5%  tests/userprog/Rubric.robustness
+# 15% for the rest.
+10%    tests/userprog/Rubric.functionality
+5%     tests/userprog/Rubric.robustness

diff --git a/src/tests/filesys/Grading.with-vm b/src/tests/filesys/Grading.with-vm
index c93069916c4da15fc6e5f0aea613a98389708d1f..e7c041e497c887c998d89901dd28874f03f2fc5a 100644 (file)
--- a/src/tests/filesys/Grading.with-vm
+++ b/src/tests/filesys/Grading.with-vm
@@ -1,22 +1,22 @@
-# Precentage of the testing point total designated for each set of
+# Percentage of the testing point total designated for each set of
 # tests.
 
 # This project is primarily about implementing the file system, but
 # all the previous functionality should work too.  It's not too easy
 # to screw it up, thus the emphasis.
 
-# 50% for extended file system features.
-16.7%  tests/filesys/extended/Rubric.functionality
-16.7%  tests/filesys/extended/Rubric.robustness
-16.6%  tests/filesys/extended/Rubric.persistence
+# 65% for extended file system features.
+30%    tests/filesys/extended/Rubric.functionality
+15%    tests/filesys/extended/Rubric.robustness
+20%    tests/filesys/extended/Rubric.persistence
 
-# 25% to not break the provided file system features.
-25%    tests/filesys/base/Rubric
+# 20% to not break the provided file system features.
+20%    tests/filesys/base/Rubric
 
-# 25% for the rest.
-12.5%  tests/userprog/Rubric.functionality
-12.5%  tests/userprog/Rubric.robustness
+# 15% for the rest.
+10%    tests/userprog/Rubric.functionality
+5%     tests/userprog/Rubric.robustness
 
-# Up to 5% bonus for working VM functionality.
-2.5%   tests/vm/Rubric.functionality
-2.5%   tests/vm/Rubric.robustness
+# Up to 10% bonus for working VM functionality.
+8%     tests/vm/Rubric.functionality
+2%     tests/vm/Rubric.robustness

diff --git a/src/tests/filesys/extended/Make.tests b/src/tests/filesys/extended/Make.tests
index 389965af890b30b9cdf0e148baf42f248c72aa45..f64659c75dea2b8cad0460ea15f2c189b8f01af9 100644 (file)
--- a/src/tests/filesys/extended/Make.tests
+++ b/src/tests/filesys/extended/Make.tests
@@ -27,6 +27,8 @@ tests/filesys/extended/dir-rm-tree_SRC += tests/filesys/extended/mk-tree.c
 
 tests/filesys/extended/syn-rw_PUTFILES += tests/filesys/extended/child-syn-rw
 
+tests/filesys/extended/dir-vine.output: TIMEOUT = 150
+
 GETTIMEOUT = 60
 
 GETCMD = pintos -v -k -T $(GETTIMEOUT)

diff --git a/src/tests/filesys/extended/Rubric.functionality b/src/tests/filesys/extended/Rubric.functionality
index 94f7c2ce1e66afbd023a14e5258bb1b95265e57b..91ed6f08cb658bb9b1444ad4ca83c21f71da9f71 100644 (file)
--- a/src/tests/filesys/extended/Rubric.functionality
+++ b/src/tests/filesys/extended/Rubric.functionality
@@ -11,8 +11,8 @@ Functionality of extended file system:
 - Test file growth.
 1      grow-create
 1      grow-seq-sm
-2      grow-seq-lg
-2      grow-sparse
+3      grow-seq-lg
+3      grow-sparse
 3      grow-two-files
 1      grow-tell
 1      grow-file-size
@@ -23,4 +23,4 @@ Functionality of extended file system:
 1      grow-root-lg
 
 - Test writing from multiple processes.
-3      syn-rw
+5      syn-rw