diff --git a/system/daaLoadTest/playlist.xml b/system/daaLoadTest/playlist.xml index 294c9a0337..96af961413 100644 --- a/system/daaLoadTest/playlist.xml +++ b/system/daaLoadTest/playlist.xml @@ -20,6 +20,12 @@ DaaLoadTest_daa1_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -39,6 +45,12 @@ DaaLoadTest_daa2_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -58,6 +70,12 @@ DaaLoadTest_daa3_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -77,6 +95,12 @@ DaaLoadTest_all_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -96,6 +120,12 @@ DaaLoadTest_daa1_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -115,6 +145,12 @@ DaaLoadTest_daa2_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -134,6 +170,12 @@ DaaLoadTest_daa3_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -153,6 +195,12 @@ DaaLoadTest_all_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge diff --git a/system/jlm/playlist.xml b/system/jlm/playlist.xml index 26cf423b4c..53183494ee 100644 --- a/system/jlm/playlist.xml +++ b/system/jlm/playlist.xml @@ -49,6 +49,12 @@ TestJlmRemoteClassAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -73,6 +79,10 @@ hotspot arm_linux + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 @@ -104,6 +114,10 @@ hotspot arm_linux|ppc64le_linux + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 @@ -137,6 +151,10 @@ hotspot arm_linux + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 @@ -156,6 +174,12 @@ TestJlmRemoteNotifierProxyAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -175,6 +199,12 @@ TestJlmRemoteThreadAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -192,6 +222,12 @@ TestJlmRemoteThreadNoAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -231,6 +267,12 @@ TestIBMJlmRemoteClassAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -303,6 +345,12 @@ TestIBMJlmRemoteClassNoAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -374,6 +422,12 @@ TestIBMJlmRemoteMemoryAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -446,6 +500,12 @@ TestIBMJlmRemoteMemoryNoAuth + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 diff --git a/system/lambdaLoadTest/playlist.xml b/system/lambdaLoadTest/playlist.xml index 072bc0ae41..3157eebee8 100644 --- a/system/lambdaLoadTest/playlist.xml +++ b/system/lambdaLoadTest/playlist.xml @@ -38,6 +38,12 @@ LambdaLoadTest_J9_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -57,6 +63,12 @@ LambdaLoadTest_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -143,6 +155,12 @@ ParallelStreamsLoadTest_J9 + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -162,6 +180,12 @@ ParallelStreamsLoadTest_CS + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge diff --git a/system/mathLoadTest/playlist.xml b/system/mathLoadTest/playlist.xml index 7bc805f9b4..cc7ea5b34e 100644 --- a/system/mathLoadTest/playlist.xml +++ b/system/mathLoadTest/playlist.xml @@ -19,6 +19,12 @@ MathLoadTest_all_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -35,6 +41,12 @@ MathLoadTest_autosimd_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -51,6 +63,12 @@ MathLoadTest_bigdecimal_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -67,6 +85,12 @@ MathLoadTest_all_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -86,6 +110,12 @@ MathLoadTest_autosimd_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -105,6 +135,12 @@ MathLoadTest_bigdecimal_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge diff --git a/system/mauveLoadTest/playlist.xml b/system/mauveLoadTest/playlist.xml index eda7e90430..5d1a1504e1 100644 --- a/system/mauveLoadTest/playlist.xml +++ b/system/mauveLoadTest/playlist.xml @@ -20,6 +20,12 @@ MauveSingleThrdLoad_J9_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -73,6 +79,12 @@ MauveSingleInvocLoad_J9_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -131,12 +143,16 @@ hotspot riscv64_linux - - https://github.com/adoptium/aqa-tests/issues/5673 - 8 - hotspot - .*windows.* - + + https://github.com/adoptium/aqa-tests/issues/5673 + 8 + hotspot + .*windows.* + + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 diff --git a/system/modularity/playlist.xml b/system/modularity/playlist.xml index 37085aa1f4..ecce9fe90c 100644 --- a/system/modularity/playlist.xml +++ b/system/modularity/playlist.xml @@ -709,6 +709,12 @@ CLLoad + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 diff --git a/system/otherLoadTest/playlist.xml b/system/otherLoadTest/playlist.xml index c83efddf2b..98918eff29 100644 --- a/system/otherLoadTest/playlist.xml +++ b/system/otherLoadTest/playlist.xml @@ -45,12 +45,16 @@ hotspot riscv64_linux - - https://github.com/adoptium/aqa-tests/issues/5673 - 8 - hotspot - .*windows.* - + + https://github.com/adoptium/aqa-tests/issues/5673 + 8 + hotspot + .*windows.* + + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 @@ -80,12 +84,16 @@ hotspot riscv64_linux - - https://github.com/adoptium/aqa-tests/issues/5673 - 8 - hotspot - .*windows.* - + + https://github.com/adoptium/aqa-tests/issues/5673 + 8 + hotspot + .*windows.* + + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 @@ -119,12 +127,16 @@ hotspot riscv64_linux - - https://github.com/adoptium/aqa-tests/issues/5673 - 8 - hotspot - .*windows.* - + + https://github.com/adoptium/aqa-tests/issues/5673 + 8 + hotspot + .*windows.* + + + https://github.com/adoptium/STF/issues/142 + 24+ + $(SYSTEMTEST_CMD_TEMPLATE) -test=MixedLoadTest -debug-generation -java-debug-args=$(Q)-Xmx3g -Xms3g$(Q) -test-args=$(Q)timeLimit=5m$(Q) -java-args-execute-initial=$(Q)$(ADD_OPENS_CMD) -Xmx3g -Xms3g$(Q); \ $(SYSTEMTEST_CMD_TEMPLATE) -test=MixedLoadTest -test-args=$(Q)timeLimit=5m$(Q) -java-args-execute-initial=$(Q)$(ADD_OPENS_CMD) -Xmx2g -Xms2g$(Q); \ @@ -157,6 +169,12 @@ ClassLoadingTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -233,6 +251,10 @@ hotspot riscv64_linux + + https://github.com/adoptium/STF/issues/142 + 24+ + Mode150 @@ -251,6 +273,12 @@ DBBLoadTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -268,6 +296,12 @@ LangLoadTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -284,6 +318,12 @@ LockingLoadTest + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -302,6 +342,12 @@ NioLoadTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -319,6 +365,12 @@ UtilLoadTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode150 Mode650 @@ -411,6 +463,12 @@ HeapHogLoadTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -430,6 +488,12 @@ ObjectTreeLoadTest_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -450,6 +514,12 @@ ClassLoadingTest_CS_5m + + + https://github.com/adoptium/STF/issues/142 + 24+ + + -Xgcpolicy:gencon -Xgc:concurrentScavenge diff --git a/system/sharedClasses/playlist.xml b/system/sharedClasses/playlist.xml index a9b1771952..79c86aba9f 100644 --- a/system/sharedClasses/playlist.xml +++ b/system/sharedClasses/playlist.xml @@ -24,6 +24,12 @@ SharedClassesAPI + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 @@ -44,6 +50,12 @@ SharedClassesWorkload + + + https://github.com/adoptium/STF/issues/142 + 24+ + + Mode110 Mode610 diff --git a/system/system.mk b/system/system.mk index 1e00f5dd1f..3f4d48fe63 100644 --- a/system/system.mk +++ b/system/system.mk @@ -47,14 +47,15 @@ else OPENJ9_PRAM="" endif +# In JDK 24+ any attempts to enable the security manager will result in an error. # In JDK18+, java.security.manager == null behaves as -Djava.security.manager=disallow. # In JDK17-, java.security.manager == null behaves as -Djava.security.manager=allow. # In case of system tests, the base infra (STF) which is used to launch tests utilizes # the security manager in net.adoptopenjdk.loadTest.LoadTest.overrideSecurityManager. # For system tests to work as expected, -Djava.security.manager=allow behaviour is -# needed in JDK18+. +# needed in JDK18-23. # Related: https://github.com/eclipse-openj9/openj9/issues/14412 -ifeq ($(filter 8 9 10 11 12 13 14 15 16 17, $(JDK_VERSION)),) +ifneq ($(filter 18 19 20 21 22 23, $(JDK_VERSION)),) export JAVA_TOOL_OPTIONS:=-Djava.security.manager=allow $(warning Environment variable JAVA_TOOL_OPTIONS is set to '$(JAVA_TOOL_OPTIONS)') endif