From 27f414be057e40251ab68eb8b81f90e17632ef05 Mon Sep 17 00:00:00 2001 From: Godmar Back Date: Mon, 8 Jan 2007 06:11:37 +0000 Subject: [PATCH] adjusted scores for P4 as discussed --- src/tests/filesys/Grading.no-vm | 36 ++++++++++---------- src/tests/filesys/Grading.with-vm | 44 ++++++++++++------------- src/tests/filesys/extended/Make.tests | 2 ++ src/tests/filesys/extended/Rubric.functionality | 6 ++-- 4 files changed, 45 insertions(+), 43 deletions(-) rewrite src/tests/filesys/Grading.no-vm (69%) rewrite src/tests/filesys/Grading.with-vm (74%) diff --git a/src/tests/filesys/Grading.no-vm b/src/tests/filesys/Grading.no-vm dissimilarity index 69% index d7c3944..ee98fc1 100644 --- 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 -# 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 - -# 25% to not break the provided file system features. -25% tests/filesys/base/Rubric - -# 25% for the rest. -12.5% tests/userprog/Rubric.functionality -12.5% tests/userprog/Rubric.robustness +# 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. + +# 65% for extended file system features. +30% tests/filesys/extended/Rubric.functionality +15% tests/filesys/extended/Rubric.robustness +20% tests/filesys/extended/Rubric.persistence + +# 20% to not break the provided file system features. +20% tests/filesys/base/Rubric + +# 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 dissimilarity index 74% index c930699..e7c041e 100644 --- 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 -# 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 - -# 25% to not break the provided file system features. -25% tests/filesys/base/Rubric - -# 25% for the rest. -12.5% tests/userprog/Rubric.functionality -12.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 +# 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. + +# 65% for extended file system features. +30% tests/filesys/extended/Rubric.functionality +15% tests/filesys/extended/Rubric.robustness +20% tests/filesys/extended/Rubric.persistence + +# 20% to not break the provided file system features. +20% tests/filesys/base/Rubric + +# 15% for the rest. +10% tests/userprog/Rubric.functionality +5% tests/userprog/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 389965a..f64659c 100644 --- 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 94f7c2c..91ed6f0 100644 --- 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 -- 2.11.4.GIT