From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Wed, 6 Mar 2024 15:48:29 +0000 (+0100)
Subject: AjcTestCase: Improve forked JVM parameter handling
X-Git-Tag: V1_9_21_2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=512d3fc281d2e56227e487dbf8ccee28cb63e589;p=aspectj.git

AjcTestCase: Improve forked JVM parameter handling

- Recognise more "fork-worthy" JVM parameters
- Pass on program arguments to program in forked JVM

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---

diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
index 11b90c3b7..b76fe4ee0 100644
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
@@ -694,10 +694,10 @@ public abstract class AjcTestCase extends TestCase {
 		else if (
 			vmargs != null && (
 				vmargs.contains("--enable-preview") ||
-				vmargs.contains("--add-modules") ||
-				vmargs.contains("--limit-modules") ||
-				vmargs.contains("--add-reads") ||
-				vmargs.contains("--add-exports")
+					vmargs.contains("--add-modules") || vmargs.contains("--limit-modules") ||
+					vmargs.contains("--add-reads") || vmargs.contains("--add-exports") || vmargs.contains("--add-opens") ||
+					vmargs.contains("-ea") || vmargs.contains("-enableassertions") ||
+					vmargs.contains("-Xmx")
 			)
 		) {
 			// If --add-modules supplied, need to fork the test
@@ -708,7 +708,10 @@ public abstract class AjcTestCase extends TestCase {
 				if (cp.indexOf("aspectjrt")==-1) {
 					cp.append(pathSeparator).append(TestUtil.aspectjrtPath().getPath());
 				}
-				String command = LangUtil.getJavaExecutable().getAbsolutePath() + " " +vmargs+ (cp.length()==0?"":" -classpath " + cp) + " " + className   ;
+				String command = LangUtil.getJavaExecutable().getAbsolutePath() + " " +
+					vmargs +
+					(cp.length() == 0 ? "" : " -classpath " + cp) + " " +
+					className + " " + String.join(" ", args);
 				if (Ajc.verbose)
 					System.out.println("\nCommand: '" + command + "'\n");
 				// Command is executed using ProcessBuilder to allow setting CWD for ajc sandbox compliance