Skip to content

Commit 36ff549

Browse files
committed
Remove -server JVM options from clusters started by AbstractTestInfrastructure
(merge main -> ce/main 117688) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 117727]
1 parent 9a3ae99 commit 36ff549

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

prj/coherence-bedrock/coherence-bedrock-testing-support/src/main/java/com/oracle/bedrock/junit/CoherenceClusterExtension.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -51,7 +51,6 @@ public CoherenceClusterExtension()
5151

5252
// establish default java process options
5353
commonOptionsByType.add(Headless.enabled());
54-
commonOptionsByType.add(HotSpot.Mode.SERVER);
5554

5655
// establish default bedrock options
5756
commonOptionsByType.add(Console.system());

prj/coherence-bedrock/coherence-bedrock-testing-support/src/main/java/com/oracle/bedrock/junit/CoherenceClusterResource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public CoherenceClusterResource()
5353

5454
// establish default java process options
5555
this.commonOptionsByType.add(Headless.enabled());
56-
this.commonOptionsByType.add(HotSpot.Mode.SERVER);
5756

5857
// establish default bedrock options
5958
this.commonOptionsByType.add(Console.system());

prj/coherence-testing-support/src/main/java/com/oracle/coherence/testing/AbstractTestInfrastructure.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,12 @@ public static OptionsByType createCacheServerOptions(String sClass, String sClas
888888
optionsByType.add(ClassPath.of(sClassPath));
889889
}
890890

891-
String[] defaultJvmOpts = new String[] { "-server",
891+
String sVendor = System.getProperty("java.vendor.version", "");
892+
boolean fGraal = sVendor.contains("Graal");
893+
894+
String[] defaultJvmOpts = fGraal
895+
? new String[0]
896+
: new String[] {
892897
"-XX:+HeapDumpOnOutOfMemoryError",
893898
"-XX:HeapDumpPath=" + System.getProperty("test.project.dir") + File.separatorChar + "target",
894899
"-XX:+ExitOnOutOfMemoryError" };

0 commit comments

Comments
 (0)