main_testing3/re_test.sh
changeset 475 59e005dcf163
parent 463 0315d9983cd0
child 477 a4e1f63157d8
--- a/main_testing3/re_test.sh	Thu Nov 02 13:53:37 2023 +0000
+++ b/main_testing3/re_test.sh	Thu Nov 02 23:34:53 2023 +0000
@@ -13,24 +13,22 @@
 # compilation tests
 
 function scala_compile {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -Xprint:parser "$1" 2> c$out 1> c$out)
+  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala-cli compile "$1" 2> c$out 1> c$out)
 }
 
 # 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-cli -i "$1" "$2" -e "urbanmain()" 2> /dev/null 1> /dev/null)
 }
 
 # purity test
-
 function scala_vars {
-    (sed 's/immutable/ok/g' c$out > cb$out;
-     egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' cb$out 2> /dev/null 1> /dev/null)
+   (sed 's/immutable/ok/g' c$out > cb$out;
+    egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' cb$out 2> /dev/null 1> /dev/null)
 }
 
 
-
 # compilation test
 
 echo -e "re.scala runs?" >> $out
@@ -41,8 +39,6 @@
     tsts=$(( 0 ))
 else
     echo -e "  --> SCALA DID NOT RUN RE.SCALA\n" >> $out
-    echo -e "      !!!! Have you checked that you are using Scala 2.13.XX (preferably with XX == 10)?                          !!!\n" >> $out
-    echo -e "      !!!! All help-requests and emails where the problems are due to the use of Scala 3 will be quietly ingnored !!!\n" >> $out
     tsts=$(( 1 )) 
 fi