testing4/postfix_test.sh
changeset 300 72688efdf17c
parent 266 ca48ac1d3c3e
--- a/testing4/postfix_test.sh	Thu Oct 31 11:33:02 2019 +0000
+++ b/testing4/postfix_test.sh	Thu Oct 31 12:01:56 2019 +0000
@@ -6,7 +6,7 @@
 
 echo -e "" > $out
 
-echo -e "Below is the feedback for your submission of CW 9, Part 2." >> $out
+echo -e "Below is the feedback for your submission of CW 9, Preliminary Part." >> $out
 echo -e "" >> $out
 
 
@@ -19,7 +19,7 @@
 # functional tests
 
 function scala_assert {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -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) 
 }
 
 # purity test
@@ -35,7 +35,7 @@
 
 if (scala_vars postfix.scala)
 then
-  echo -e "   --> fail (make triple-sure your program conforms to the required format)" >> $out 
+  echo -e "   --> FAIL (make triple-sure your program conforms to the required format)" >> $out 
   tsts0=$(( 0 ))
 else
   echo -e "  --> success" >> $out
@@ -97,7 +97,7 @@
   fi
 fi
 
-
+echo -e "" >> $out
 
 ### postfix2 tests
 
@@ -107,7 +107,7 @@
 
 if (scala_vars postfix2.scala)
 then
-  echo -e "   --> fail (make triple-sure your program conforms to the required format)" >> $out 
+  echo -e "   --> FAIL (make triple-sure your program conforms to the required format)" >> $out 
   tsts0=$(( 0 ))
 else
   echo -e "  --> success" >> $out