diff -r a057dc4457fc -r 87b9e3e2c1a7 marking1/drumb_test.sh --- a/marking1/drumb_test.sh Tue Oct 29 11:11:44 2019 +0000 +++ b/marking1/drumb_test.sh Tue Oct 29 14:12:24 2019 +0000 @@ -9,7 +9,7 @@ echo `date` >> $out echo >> $out echo "Below is the feedback and provisional marks for your submission" >> $out -echo "for the Main Part of Assignment 6 . Please note all marks are provisional until" >> $out +echo "for the Core 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 @@ -32,7 +32,7 @@ # functional tests function scala_assert { - (ulimit -t 60; JAVA_OPTS="-Xmx4g" scala -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null) + (ulimit -t 60; JAVA_OPTS="-Xmx4g" scala -i "$1" -- "$2" -e "" 2> /dev/null 1> /dev/null) } @@ -217,5 +217,5 @@ ## final marks echo >> $out -echo "Overall mark for CW 6, Main Part" | tee -a $out +echo "Overall mark for CW 6, Core Part" | tee -a $out echo "$marks" | tee -a $out