adjustments to scores for P2 as discussed.

diff --git a/src/tests/userprog/Grading b/src/tests/userprog/Grading
index 3746aae7e1302f8d921546dfa315e02dc6767abb..f70dc99acef673fc5a6408c0f7498dc7b027468f 100644 (file)
--- a/src/tests/userprog/Grading
+++ b/src/tests/userprog/Grading
@@ -6,6 +6,6 @@
 # should come "for free".  Thus, the points emphasis below.
 
 35%    tests/userprog/Rubric.functionality
-35%    tests/userprog/Rubric.robustness
- 5%    tests/userprog/no-vm/Rubric
-25%    tests/filesys/base/Rubric
+25%    tests/userprog/Rubric.robustness
+10%    tests/userprog/no-vm/Rubric
+30%    tests/filesys/base/Rubric

diff --git a/src/tests/userprog/Rubric.functionality b/src/tests/userprog/Rubric.functionality
index 7672c0155c90431171442b625c52e392e4b62826..ea76c44d6561e43e3598acfde440150ffb600fd7 100644 (file)
--- a/src/tests/userprog/Rubric.functionality
+++ b/src/tests/userprog/Rubric.functionality
@@ -1,32 +1,32 @@
 Functionality of system calls:
 - Test argument passing on Pintos command line.
-5      args-none
-5      args-single
-5      args-multiple
+3      args-none
+3      args-single
+3      args-multiple
 3      args-many
 3      args-dbl-space
 
 - Test "create" system call.
-5      create-empty
-5      create-long
-5      create-normal
-5      create-exists
+3      create-empty
+3      create-long
+3      create-normal
+3      create-exists
 
 - Test "open" system call.
-5      open-missing
-5      open-normal
-5      open-twice
+3      open-missing
+3      open-normal
+3      open-twice
 
 - Test "read" system call.
-5      read-normal
-5      read-zero
+3      read-normal
+3      read-zero
 
 - Test "write" system call.
-5      write-normal
-5      write-zero
+3      write-normal
+3      write-zero
 
 - Test "close" system call.
-5      close-normal
+3      close-normal
 
 - Test "exec" system call.
 5      exec-once
@@ -41,12 +41,12 @@ Functionality of system calls:
 5      exit
 
 - Test "halt" system call.
-5      halt
+3      halt
 
 - Test recursive execution of user programs.
 15     multi-recurse
 
 - Test read-only executable feature.
-5      rox-simple
+3      rox-simple
 3      rox-child
 3      rox-multichild

diff --git a/src/tests/userprog/Rubric.robustness b/src/tests/userprog/Rubric.robustness
index 569615687fec0f24710661455b21ee56f879002e..b7d1035a745bb18b140e5a6aa6c9e32ba63acac5 100644 (file)
--- a/src/tests/userprog/Rubric.robustness
+++ b/src/tests/userprog/Rubric.robustness
@@ -11,11 +11,11 @@ Robustness of system calls:
 2      multi-child-fd
 
 - Test robustness of pointer handling.
-5      create-bad-ptr
-5      exec-bad-ptr
-5      open-bad-ptr
-5      read-bad-ptr
-5      write-bad-ptr
+3      create-bad-ptr
+3      exec-bad-ptr
+3      open-bad-ptr
+3      read-bad-ptr
+3      write-bad-ptr
 
 - Test robustness of buffer copying across page boundaries.
 3      create-bound
@@ -29,8 +29,8 @@ Robustness of system calls:
 2      open-empty
 
 - Test robustness of system call implementation.
-5      sc-bad-arg
-5      sc-bad-sp
+3      sc-bad-arg
+3      sc-bad-sp
 5      sc-boundary
 5      sc-boundary-2