marking1/collatz_test.sh
changeset 281 87b9e3e2c1a7
parent 267 9e0216756771
child 343 c8fcc0e0a57f
--- a/marking1/collatz_test.sh	Tue Oct 29 11:11:44 2019 +0000
+++ b/marking1/collatz_test.sh	Tue Oct 29 14:12:24 2019 +0000
@@ -11,7 +11,7 @@
 echo `date` >> $out
 echo >> $out
 echo "Below is the feedback and provisional marks for your submission" >> $out
-echo "for the Basic Part of Assignment 6.  Please note all marks are provisional until" >> $out
+echo "for the Preliminary Part of Assignment 6.  Please note all marks are provisional until" >> $out
 echo "ratified by the assessment board -- this is not an official" >> $out
 echo "results transcript." >> $out
 echo "" >> $out
@@ -31,7 +31,7 @@
 # functional tests
 
 function scala_assert {
-  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
 }
 
 # purity test