diff -r 44383203970f -r e2170c91a9f2 pre_marking3/postfix_test.sh --- a/pre_marking3/postfix_test.sh Fri Jan 15 02:47:51 2021 +0000 +++ b/pre_marking3/postfix_test.sh Mon Jan 18 22:12:39 2021 +0000 @@ -30,7 +30,7 @@ # 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" -e "" 2> /dev/null 1> /dev/null) } # purity test @@ -58,7 +58,7 @@ # if [ $tsts -eq 0 ] then - echo -e "postfix.scala does not contain VARS, RETURNS etc??" | tee -a $out + echo -e "postfix.scala does not contain VARS, RETURNS etc?" | tee -a $out if (scala_vars postfix.scala) then @@ -69,7 +69,7 @@ tsts=$(( 0 )) fi else - tsts=$(( 1 )) + tsts=$(( 1 )) fi @@ -185,7 +185,7 @@ echo -e " compute(syard(split(\"( 4 ^ 3 ) ^ 2\"))) == 4096" | tee -a $out echo -e " compute(syard(split(\"( 3 + 1 ) ^ 2 ^ 3\"))) == 65536" | tee -a $out - if (scala_assert "postfix2.scala" "postfix_test10.scala") + if (scala_assert "postfix2.scala" "postfix_test4.scala") then echo -e " --> success" | tee -a $out marks=$(( marks + 0.5 ))