--- a/marking5/bf_test.sh Wed Oct 30 11:51:02 2019 +0000
+++ b/marking5/bf_test.sh Wed Oct 30 12:37:18 2019 +0000
@@ -6,14 +6,14 @@
out=${1:-output}
-echo "" > $out
+echo -e "" > $out
-echo "Below is the feedback and provisional marks for your submission" >> $out
-echo "for assignment 10 Part 1. 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
+echo -e "Below is the feedback and provisional marks for your submission" >> $out
+echo -e "for assignment 10 Part 1. Please note all marks are provisional until" >> $out
+echo -e "ratified by the assessment board -- this is not an official" >> $out
+echo -e "results transcript." >> $out
+echo -e "" >> $out
# marks for CW10 part 1
marks=$(( 0 ))
@@ -21,13 +21,13 @@
# compilation tests
function scala_compile {
- (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc "$1" 2> /dev/null 1> /dev/null)
+ (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala "$1" 2> /dev/null 1> /dev/null)
}
# functional tests
function scala_assert {
- (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+ (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
}
@@ -41,14 +41,14 @@
# var, return, ListBuffer test
#
-echo "bf.scala does not contain vars, returns, Arrays, ListBuffers etc?" | tee -a $out
+echo -e "bf.scala does not contain vars, returns, Arrays, ListBuffers etc?" | tee -a $out
if (scala_vars bf.scala)
then
- echo " --> test failed" | tee -a $out
+ echo -e " --> FAIL (make triple-sure your program conforms to the required format)" | tee -a $out
tsts0=$(( 1 ))
else
- echo " --> success" | tee -a $out
+ echo -e " --> success" | tee -a $out
tsts0=$(( 0 ))
fi
@@ -56,14 +56,14 @@
# compilation test
if [ $tsts0 -eq 0 ]
then
- echo "bf.scala runs?" | tee -a $out
+ echo -e "bf.scala runs?" | tee -a $out
if (scala_compile bf.scala)
then
- echo " --> success" | tee -a $out
+ echo -e " --> success" | tee -a $out
tsts1=$(( 0 ))
else
- echo " --> scala bf.scala did not run successfully" | tee -a $out
+ echo -e " --> SCALA DID NOT RUN BF.SCALA\n" | tee -a $out
tsts1=$(( 1 ))
fi
else
@@ -75,15 +75,15 @@
if [ $tsts1 -eq 0 ]
then
- echo " load_bff(\"benchmark.bf\").length == 188" | tee -a $out
- echo " load_bff(\"foobar.bf\") == \"\"" | tee -a $out
+ echo -e " load_bff(\"benchmark.bf\").length == 188" | tee -a $out
+ echo -e " load_bff(\"foobar.bf\") == \"\"" | tee -a $out
if (scala_assert "bf.scala" "bf_test1.scala")
then
- echo " --> success" | tee -a $out
+ echo -e " --> success" | tee -a $out
marks=$(( marks + 1 ))
else
- echo " --> test failed" | tee -a $out
+ echo -e " --> \n ONE TEST FAILED\n" | tee -a $out
fi
fi
@@ -92,17 +92,17 @@
if [ $tsts1 -eq 0 ]
then
- echo " sread(Map(), 2) == 0" | tee -a $out
- echo " sread(Map(2 -> 1), 2) == 1" | tee -a $out
- echo " write(Map(), 1, 2) == Map(1 -> 2)" | tee -a $out
- echo " write(Map(1 -> 0), 1, 2) == Map(1 -> 2)" | tee -a $out
+ echo -e " sread(Map(), 2) == 0" | tee -a $out
+ echo -e " sread(Map(2 -> 1), 2) == 1" | tee -a $out
+ echo -e " write(Map(), 1, 2) == Map(1 -> 2)" | tee -a $out
+ echo -e " write(Map(1 -> 0), 1, 2) == Map(1 -> 2)" | tee -a $out
if (scala_assert "bf.scala" "bf_test2.scala")
then
- echo " --> success" | tee -a $out
+ echo -e " --> success" | tee -a $out
marks=$(( marks + 1 ))
else
- echo " --> test failed" | tee -a $out
+ echo -e " --> \n ONE TEST FAILED\n" | tee -a $out
fi
fi
@@ -110,21 +110,21 @@
if [ $tsts1 -eq 0 ]
then
- echo " jumpRight(\"[xxxxxx]xxx\", 1, 0) == 8" | tee -a $out
- echo " jumpRight(\"[xx[x]x]xxx\", 1, 0) == 8" | tee -a $out
- echo " jumpRight(\"[xx[x]x]xxx\", 1, 0) == 8" | tee -a $out
- echo " jumpRight(\"[xx[xxx]xxx\", 1, 0) == 11" | tee -a $out
- echo " jumpRight(\"[x[][]x]xxx\", 1, 0) == 8" | tee -a $out
- echo " jumpLeft(\"[xxxxxx]xxx\", 6, 0) == 1" | tee -a $out
- echo " jumpLeft(\"[xxxxxx]xxx\", 7, 0) == -1" | tee -a $out
- echo " jumpLeft(\"[x[][]x]xxx\", 6, 0) == 1" | tee -a $out
+ echo -e " jumpRight(\"[xxxxxx]xxx\", 1, 0) == 8" | tee -a $out
+ echo -e " jumpRight(\"[xx[x]x]xxx\", 1, 0) == 8" | tee -a $out
+ echo -e " jumpRight(\"[xx[x]x]xxx\", 1, 0) == 8" | tee -a $out
+ echo -e " jumpRight(\"[xx[xxx]xxx\", 1, 0) == 11" | tee -a $out
+ echo -e " jumpRight(\"[x[][]x]xxx\", 1, 0) == 8" | tee -a $out
+ echo -e " jumpLeft(\"[xxxxxx]xxx\", 6, 0) == 1" | tee -a $out
+ echo -e " jumpLeft(\"[xxxxxx]xxx\", 7, 0) == -1" | tee -a $out
+ echo -e " jumpLeft(\"[x[][]x]xxx\", 6, 0) == 1" | tee -a $out
if (scala_assert "bf.scala" "bf_test3.scala")
then
- echo " --> success" | tee -a $out
+ echo -e " --> success" | tee -a $out
marks=$(( marks + 2 ))
else
- echo " --> test failed" | tee -a $out
+ echo -e " --> \n ONE TEST FAILED\n" | tee -a $out
fi
fi
@@ -144,15 +144,15 @@
if (scala_assert "bf.scala" "bf_test4.scala")
then
- echo " --> success" | tee -a $out
+ echo -e " --> success" | tee -a $out
marks=$(( marks + 2 ))
else
- echo " --> test failed" | tee -a $out
+ echo -e " --> \n ONE TEST FAILED\n" | tee -a $out
fi
fi
## final marks
-echo "Overall mark for CW 10, Part 1" | tee -a $out
-echo "$marks" | tee -a $out
+echo -e "Overall mark for CW 10, Part 1" | tee -a $out
+echo -e "$marks" | tee -a $out