diff -r 34d2cfb7761a -r 86d59b074abe cw5_marking/cw5_test.sh --- a/cw5_marking/cw5_test.sh Fri Sep 18 10:57:24 2026 +0100 +++ b/cw5_marking/cw5_test.sh Fri Sep 18 10:58:01 2026 +0100 @@ -1,7 +1,7 @@ -#!/bin/zsh +#!/bin/zsh -o pipefail # to make the script fail safely -set -euo pipefail +#set -euo pipefail out=${1:-output} @@ -31,15 +31,18 @@ setopt no_nomatch function scala_assert { - rm -rf /Users/cu/.ammonite/cache/3.0.0-M2/* 1> /dev/null 2> /dev/null ; - (ulimit -t 300; JAVA_OPTS="-Xmx1g -XX:MaxJavaStackTraceDepth=10" amm -s "$1" 1>> $out 2>> $out) + rm -rf /Users/cu/.ammonite/cache/3.* 1> /dev/null 2> /dev/null ; + (ulimit -t 200; JAVA_OPTS="-Xmx1g -XX:MaxJavaStackTraceDepth=10" amm --no-warn -s "$1" 1>> $out 2>> $out) } function scala_fail { - rm -rf /Users/cu/.ammonite/cache/3.0.0-M2/* 1> /dev/null 2> /dev/null ; - (ulimit -t 300; JAVA_OPTS="-Xmx1g -XX:MaxJavaStackTraceDepth=10" amm -s "$1" | tee -a $out) + rm -rf /Users/cu/.ammonite/cache/3.* 1> /dev/null 2> /dev/null ; + (ulimit -t 200; JAVA_OPTS="-Xmx1g -XX:MaxJavaStackTraceDepth=10" amm --no-warn -s "$1" | tee -a $out) } +# remove @main +gsed -i -e "s|^@main||g" cw05.sc + ### compilation test @@ -52,7 +55,7 @@ tsts=$(( 0 )) else echo -e " --> AMM DID NOT compile cw05.sc\n" | tee -a $out - cat c$out | tee -a $out + #cat c$out | tee -a $out tsts=$(( 1 )) fi @@ -70,7 +73,7 @@ marks=$(( marks + 2.0 )) else echo -e " --> FAILED\n" | tee -a $out - cat $out | tee -a $out + #cat $out | tee -a $out fi fi @@ -95,7 +98,7 @@ DIFF=$(( $END - $START )) echo -e " This test ran for $DIFF seconds" | tee -a $out echo -e " --> FAILED\n" | tee -a $out - cat $out | tee -a $out + #cat $out | tee -a $out fi fi @@ -108,7 +111,7 @@ if [ $tsts -eq 0 ] then - echo -e "3.1) Generating ll-file for mand.fun:\n" | tee -a $out + echo -e "3.1) Generating ll-file for mand.fun:" | tee -a $out echo >> $out cat cw05.sc c3_add.sc > cw051_add.sc @@ -119,18 +122,19 @@ else echo -e " --> FAIL\n" | tee -a $out cat c$out >> $out - tail -25 $out | pr -to10 + #tail -25 $out | pr -to10 tstsB=$(( 1 )) fi fi +echo >> $out if [ $tstsB -eq 0 ] then echo -e "3.2) Running mand.ll and check its output" | tee -a $out if (scala_fail "c4.sc") then - echo -e " --> success (+ 12.0 Marks)\n" | tee -a $out - marks=$(( marks + 12.0 )) + echo -e " --> success (+ 8.0 Marks)\n" | tee -a $out + marks=$(( marks + 8.0 )) else echo -e " --> FAIL\n" | tee -a $out echo -e " generated:" | tee -a $out @@ -156,8 +160,8 @@ tstsB=$(( 0 )) else echo -e " --> FAIL\n" | tee -a $out - cat c$out >> $out - tail -25 $out | pr -to10 + #cat c$out >> $out + #tail -25 $out | pr -to10 tstsB=$(( 1 )) fi fi @@ -167,8 +171,8 @@ echo -e "4.2) Running sqr.ll and check its output" | tee -a $out if (scala_fail "c6.sc") then - echo -e " --> success (+ 6.0 Marks)\n" | tee -a $out - marks=$(( marks + 6.0 )) + echo -e " --> success (+ 5.0 Marks)\n" | tee -a $out + marks=$(( marks + 5.0 )) else echo -e " --> FAIL\n" | tee -a $out echo -e " generated:" | tee -a $out