Make runtime-testsuite tests run in parallel

antlr · Dec 20, 2021 · cc65c15 · cc65c15
1 parent ed31d62
commit cc65c15
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.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.13
     steps:
       - checkout
       - run:
@@ -32,7 +32,7 @@ jobs:
         type: string
         default: java
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:11.0.13
     environment:
       TARGET: << parameters.target >>
       GROUP: << parameters.test-group >>

diff --git a/runtime-testsuite/pom.xml b/runtime-testsuite/pom.xml
@@ -106,6 +106,9 @@
                         <include>**/dart/Test*.java</include>
                         <include>${antlr.tests.swift}</include>
                     </includes>
+					<parallel>all</parallel>
+					<useUnlimitedThreads>true</useUnlimitedThreads>
+					<forkCount>0</forkCount>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java
@@ -209,7 +209,7 @@ public boolean buildProject() {
 		return true;
 	}
 
-	private synchronized boolean initializeRuntime() {
+	private static synchronized boolean initializeRuntime() {
 		// Compile runtime project once per tests session
 		if (isRuntimeInitialized)
 			return true;
@@ -247,7 +247,7 @@ private synchronized boolean initializeRuntime() {
 			}
 			cSharpTestProjectContent = out.toString().replace(cSharpAntlrRuntimeDllName, Paths.get(cSharpCachingDirectory, cSharpAntlrRuntimeDllName).toString());
 
-			success = runProcess(args, cSharpCachingDirectory);
+			success = initializeRuntimeAt(args, cSharpCachingDirectory);
 		} catch (Exception e) {
 			e.printStackTrace(System.err);
 			return false;
@@ -261,6 +261,27 @@ private static String getConfig() {
 		return isDebug ? "Debug" : "Release";
 	}
 
+  private static boolean initializeRuntimeAt(String[] args, String path) throws Exception {
+		ProcessBuilder pb = new ProcessBuilder(args);
+		pb.directory(new File(path));
+		Process process = pb.start();
+		StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream());
+		StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream());
+		stdoutVacuum.start();
+		stderrVacuum.start();
+		process.waitFor();
+		stdoutVacuum.join();
+		stderrVacuum.join();
+		int exitValue = process.exitValue();
+		boolean success = (exitValue == 0);
+		if (!success) {
+			System.err.println("runProcess command: " + Utils.join(args, " "));
+			System.err.println("runProcess exitValue: " + exitValue);
+			System.err.println("runProcess stdoutVacuum: " + stdoutVacuum.toString());
+		}
+		return success;
+  }
+
 	private boolean runProcess(String[] args, String path) throws Exception {
 		return runProcess(args, path, 0);
 	}