Tweak examples

diff --git a/README.rst b/README.rst
index e795c373cf3bc090a0aef128ad0463e7dfda80d5..cfe617ada251e701d10246bb5b70540ddc7f2775 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -55,8 +55,8 @@ something like this::
   $END_COMMENTS
 
   # Automated test result section
+  # Un-comment the appropriate directive for each test failed.
   @tests
-   # Un-comment the appropriate directive for each test failed.
    #:ftbfs_all
    #:simple_test
    #:more_interesting_test
@@ -243,8 +243,8 @@ among other defines ::
   #! ...
 
   # Automated test result section
-  @tests 0 40 - Functionality Tests
   # Un-comment the appropriate directive for each test failed.
+  @tests 0 40 - Functionality Tests
 
   #! ...
 

diff --git a/examples/data b/examples/data
index f1019053e83d222d462ca87eca93e501b14a5c2f..67e5ee88cf1493ae4f3b50037a0a347bbd40d21b 100644 (file)
--- a/examples/data
+++ b/examples/data
@@ -37,4 +37,8 @@ $END_COMMENTS
 
 @tests2
 :some_other_test
-:yet_another_test
+#:yet_another_test
+
+$BEGIN_COMMENTS
+
+$END_COMMENTS

diff --git a/examples/data.grade b/examples/data.grade
new file mode 100644 (file)
index 0000000..0212ab1
--- /dev/null
+++ b/examples/data.grade
@@ -0,0 +1,38 @@
+Packaging: [10.0/10.0] (100.0%)
+
+ Additional Grader Comments:
+ 
+  Some grader comments on packaging
+  
+Functionality Tests: [28.0/40.0] (70.0%)
+
+ (-6.0)
+ The buffer-passing test seems to mangle bytes on occasion.
+ 
+ (-10.0% == -4.0)
+ There is a minor problem with the buffer-passing test output
+ when given an unusually long input string.
+ 
+ (-1.0)
+ Some small problem happened (see grader commentary below).
+ 
+ (-1.0)
+ Some small problem happened (see grader commentary below).
+ 
+ Additional Grader Comments:
+ 
+  More grader comments in a different section
+  
+One Last Thing: [8.0/10.0] (80.0%)
+
+ Additional Grader Comments:
+ 
+  abcd
+  
+More Functionality Tests: [20.0/40.0] (50.0%)
+
+ (-20.0)
+ SOT
+ 
+ 
+TOTAL: [66.0/100.0] (66.0%)

diff --git a/examples/defines.conf b/examples/defines.conf
index 963164cb60c383844ed16952bec52719f902ce1b..24cc3f8f61740e31ec353e707ede6869aa2de580 100644 (file)
--- a/examples/defines.conf
+++ b/examples/defines.conf
@@ -11,8 +11,8 @@ The submission failed to compile.
 @justScoreMe seconly 10 - One Last Thing
 
 # Manual test result section
-@tests bounding simple 40 - Functionality Tests
 # Un-comment the appropriate directive for each test failed.
+@tests bounding simple 40 - Functionality Tests
 
 :simple_test -6
 The buffer-passing test seems to mangle bytes on occasion.
@@ -23,7 +23,6 @@ There is a minor problem with the buffer-passing test output
 when given an unusually long input string.
 .
 
-# May be assessed more than once!
 ;misc_ding -1
 Some small problem happened (see grader commentary below).
 .

diff --git a/examples/defines.skeleton b/examples/defines.skeleton
new file mode 100644 (file)
index 0000000..3f079ef
--- /dev/null
+++ b/examples/defines.skeleton
@@ -0,0 +1,33 @@
+# Basic features of the handin
+@packaging
+ #:ftbfs_all
+
+$BEGIN_COMMENTS
+
+$END_COMMENTS
+
+# Here is a section without any dings; it uses a different
+# section definition to take an argument directly in the
+# data file.
+@justScoreMe <score out of 10.0>
+
+$BEGIN_COMMENTS
+
+$END_COMMENTS
+
+# Manual test result section
+# Un-comment the appropriate directive for each test failed.
+@tests
+ #:simple_test
+ #:more_interesting_test_minor
+ #:misc_ding # repeat as needed
+
+$BEGIN_COMMENTS
+
+$END_COMMENTS
+
+# These lines will, despite this section being hidden, still
+# appear in the skeleton file.  This may be useful for giving
+# instructions to graders.
+
+# This is a second paragraph appearing in the skeleton.