Merge dev into master

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test_tool_and_runtime_java:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:11.0
     steps:
       - checkout
       - run:
@@ -13,13 +13,13 @@ jobs:
           name: test runtime
           command: |
             cd runtime-testsuite
-            mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=java.* test
+            mvn -Dparallel=classes -DthreadCount=4 -Dtest=java.** test
             cd ..
       - run:
           name: test tool
           command: |
             cd tool-testsuite
-            mvn -q -Dparallel=methods -DthreadCount=4 test
+            mvn -Dparallel=classes -DthreadCount=4 test
             cd ..
   test_runtime:
     parameters:
@@ -32,7 +32,11 @@ jobs:
         type: string
         default: java
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:11.0
+        environment:
+          MAVEN_OPTS: -Xmx512m
+    parallelism: 4
+    resource_class: large
     environment:
       TARGET: << parameters.target >>
       GROUP: << parameters.test-group >>
@@ -57,10 +61,4 @@ workflows:
       - test_runtime:
           matrix:
             parameters:
-              target: [ dart, go, python2, python3, javascript, php ]
-      - test_runtime:
-          matrix:
-            parameters:
-#              target: [ cpp, dotnet, swift ]
-              target: [ cpp, dotnet, dart ]
-              test-group: [ LEXER, PARSER, RECURSION ]
+              target: [ dart, go, python2, python3, javascript, php, cpp, dotnet ]

.circleci/scripts/install-linux-javascript.sh

@@ -9,10 +9,6 @@ sudo apt-get install -y nodejs
 echo node version: $(node --version)
 echo "done installing nodejs"
 
-echo "installing yarn..."
-sudo npm install -g [email protected]
-echo "done installing yarn"
-
 echo "packaging javascript runtime..."
 pushd runtime/JavaScript
   sudo npm install

.circleci/scripts/install-linux-php.sh

@@ -2,15 +2,19 @@
 
 set -euo pipefail
 
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-sudo apt-get update -qq
-
+sudo apt install software-properties-common
+sudo add-apt-repository ppa:ondrej/php
 sudo apt update
 
-sudo apt install php-all-dev
+sudo apt install wget php8.0-cli php8.0-zip unzip
+wget -O composer-setup.php https://getcomposer.org/installer
+sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
+
+sudo apt install php8.0
+sudo apt install php8.0-mbstring
+sudo apt install php8.0-xml
 php -v
 
-sudo apt install composer
 
 git clone https://github.com/antlr/antlr-php-runtime.git runtime/PHP
 composer install -d runtime/PHP

.circleci/scripts/run-tests-cpp.sh

@@ -3,15 +3,6 @@
 set -euo pipefail
 
 pushd runtime-testsuite
-  echo "running maven tests..."
-  if [ $GROUP == "LEXER" ]; then
-      mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LexerTests" -Dtest=cpp.* test
-  elif [ $GROUP == "PARSER" ]; then
-      mvn -q -Dgroups="org.antlr.v4.test.runtime.category.ParserTests" -Dtest=cpp.* test
-  elif [ $GROUP == "RECURSION" ]; then
-      mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LeftRecursionTests" -Dtest=cpp.* test
-  else
-      mvn -q -Dtest=cpp.* test
-  fi
+export MAVEN_OPTS="-Xmx8g"
+mvn -Dparallel=classes -DthreadCount=4 -Dtest=cpp.** test
 popd
-

.circleci/scripts/run-tests-dart.sh

@@ -6,6 +6,6 @@ dart --version
 
 pushd runtime-testsuite
   echo "running maven tests..."
-#  mvn -q -Dparallel=classes -DthreadCount=4 -Dtest=dart.* test
-  mvn -q -Dtest=dart.* test
+  export MAVEN_OPTS="-Xmx8g"
+  mvn -Dparallel=classes -DthreadCount=4 -Dtest=dart.** test
 popd

.circleci/scripts/run-tests-dotnet.sh

@@ -2,15 +2,7 @@
 
 set -euo pipefail
 
-pushd runtime-testsuite/
-  echo "running maven tests..."
-  if [ $GROUP == "LEXER" ]; then
-      mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LexerTests" -Dtest=csharp.* test
-  elif [ $GROUP == "PARSER" ]; then
-      mvn -q -Dgroups="org.antlr.v4.test.runtime.category.ParserTests" -Dtest=csharp.* test
-  elif [ $GROUP == "RECURSION" ]; then
-      mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LeftRecursionTests" -Dtest=csharp.* test
-  else
-      mvn -q -Dtest=csharp.* test
-  fi
+pushd runtime-testsuite
+export MAVEN_OPTS="-Xmx8g"
+mvn -Dparallel=classes -DthreadCount=4 -Dtest=csharp.** test
 popd

.circleci/scripts/run-tests-go.sh

@@ -6,5 +6,6 @@ go version
 
 pushd runtime-testsuite
     echo "running maven tests..."
-    mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=go.* test
-popd
+    export MAVEN_OPTS="-Xmx8g"
+    mvn -Dparallel=classes -DthreadCount=4 -Dtest=go.** test
+popd

.circleci/scripts/run-tests-javascript.sh

@@ -6,18 +6,19 @@ declare -i RESULT=0
 
 pushd runtime/JavaScript
 
-  echo "running jest tests..."
-  yarn test
+  echo "running jasmine tests..."
+  npm test
   RESULT+=$?
 
 popd
 
 pushd runtime-testsuite
 
   echo "running maven tests..."
-  mvn -q -Dtest=javascript.* test
+  export MAVEN_OPTS="-Xmx8g"
+  mvn -Dtest=javascript.** test
   RESULT+=$?
 
 popd
 
-exit $RESULT
+exit $RESULT

.circleci/scripts/run-tests-php.sh

@@ -7,5 +7,6 @@ php -v
 php_path=$(which php)
 pushd runtime-testsuite
   echo "running maven tests..."
-  mvn -q -DPHP_PATH="${php_path}" -Dparallel=methods -DthreadCount=4 -Dtest=php.* test
+  export MAVEN_OPTS="-Xmx8g"
+  mvn -DPHP_PATH="${php_path}" -Dparallel=classes -DthreadCount=4 -Dtest=php.** test
 popd

.circleci/scripts/run-tests-python2.sh

@@ -4,21 +4,19 @@ set -euo pipefail
 
 python2 --version
 
-pushd runtime/Python2/tests
-  echo "running native tests..."
-  python2 run.py
-  rc=$?
-  if [ $rc != 0 ]; then
-    echo "failed running native tests"
-  fi
-popd
+# TODO: https://github.com/antlr/antlr4/issues/3521
+#
+# pushd runtime/Python2/tests
+#   echo "running native tests..."
+#   python2 run.py
+#   rc=$?
+#   if [ $rc != 0 ]; then
+#     echo "failed running native tests"
+#   fi
+# popd
 
-if [ $rc == 0 ]; then
-  pushd runtime-testsuite
-    echo "running maven tests..."
-    mvn -q -Dtest=python2.* test
-    rc=$?
-  popd
-fi
-
-# return $rc
+pushd runtime-testsuite
+  echo "running maven tests..."
+  export MAVEN_OPTS="-Xmx8g"
+  mvn -Dparallel=classes -DthreadCount=4 -Dtest=python2.** test
+popd

.circleci/scripts/run-tests-python3.sh

@@ -4,21 +4,19 @@ set -euo pipefail
 
 python3 --version
 
-pushd runtime/Python3/tests
-  echo "running native tests..."
-  python3 run.py
-  rc=$?
-  if [ $rc != 0 ]; then
-    echo "failed running native tests"
-  fi
-popd
-
-if [ $rc == 0 ]; then
-  pushd runtime-testsuite
-    echo "running maven tests..."
-    mvn -q -Dtest=python3.* test
-    rc=$?
-  popd
-fi
+# TODO: https://github.com/antlr/antlr4/issues/3521
+#
+# pushd runtime/Python3/tests
+#   echo "running native tests..."
+#   python3 run.py
+#   rc=$?
+#   if [ $rc != 0 ]; then
+#     echo "failed running native tests"
+#   fi
+# popd
 
-# return $rc
+pushd runtime-testsuite
+  echo "running maven tests..."
+  export MAVEN_OPTS="-Xmx8g"
+  mvn -Dparallel=classes -DthreadCount=4 -Dtest=python3.** test
+popd