diff --git a/system/daaLoadTest/playlist.xml b/system/daaLoadTest/playlist.xml index 96af961413..294c9a0337 100644 --- a/system/daaLoadTest/playlist.xml +++ b/system/daaLoadTest/playlist.xml @@ -20,12 +20,6 @@ DaaLoadTest_daa1_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -45,12 +39,6 @@ DaaLoadTest_daa2_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -70,12 +58,6 @@ DaaLoadTest_daa3_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -95,12 +77,6 @@ DaaLoadTest_all_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -120,12 +96,6 @@ DaaLoadTest_daa1_CS_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -145,12 +115,6 @@ DaaLoadTest_daa2_CS_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -170,12 +134,6 @@ DaaLoadTest_daa3_CS_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -195,12 +153,6 @@ 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 53183494ee..26cf423b4c 100644 --- a/system/jlm/playlist.xml +++ b/system/jlm/playlist.xml @@ -49,12 +49,6 @@ TestJlmRemoteClassAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -79,10 +73,6 @@ hotspot arm_linux - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 @@ -114,10 +104,6 @@ hotspot arm_linux|ppc64le_linux - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 @@ -151,10 +137,6 @@ hotspot arm_linux - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 @@ -174,12 +156,6 @@ TestJlmRemoteNotifierProxyAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -199,12 +175,6 @@ TestJlmRemoteThreadAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -222,12 +192,6 @@ TestJlmRemoteThreadNoAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -267,12 +231,6 @@ TestIBMJlmRemoteClassAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -345,12 +303,6 @@ TestIBMJlmRemoteClassNoAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -422,12 +374,6 @@ TestIBMJlmRemoteMemoryAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -500,12 +446,6 @@ TestIBMJlmRemoteMemoryNoAuth - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 diff --git a/system/lambdaLoadTest/playlist.xml b/system/lambdaLoadTest/playlist.xml index 3157eebee8..072bc0ae41 100644 --- a/system/lambdaLoadTest/playlist.xml +++ b/system/lambdaLoadTest/playlist.xml @@ -38,12 +38,6 @@ LambdaLoadTest_J9_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -63,12 +57,6 @@ LambdaLoadTest_CS_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -155,12 +143,6 @@ ParallelStreamsLoadTest_J9 - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -180,12 +162,6 @@ 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 cc7ea5b34e..7bc805f9b4 100644 --- a/system/mathLoadTest/playlist.xml +++ b/system/mathLoadTest/playlist.xml @@ -19,12 +19,6 @@ MathLoadTest_all_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -41,12 +35,6 @@ MathLoadTest_autosimd_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -63,12 +51,6 @@ MathLoadTest_bigdecimal_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -85,12 +67,6 @@ MathLoadTest_all_CS_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -110,12 +86,6 @@ MathLoadTest_autosimd_CS_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - -Xgcpolicy:gencon -Xgc:concurrentScavenge @@ -135,12 +105,6 @@ 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 5d1a1504e1..59487928a5 100644 --- a/system/mauveLoadTest/playlist.xml +++ b/system/mauveLoadTest/playlist.xml @@ -20,12 +20,6 @@ MauveSingleThrdLoad_J9_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -79,12 +73,6 @@ MauveSingleInvocLoad_J9_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -149,10 +137,6 @@ hotspot .*windows.* - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 diff --git a/system/modularity/playlist.xml b/system/modularity/playlist.xml index ecce9fe90c..37085aa1f4 100644 --- a/system/modularity/playlist.xml +++ b/system/modularity/playlist.xml @@ -709,12 +709,6 @@ CLLoad - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 diff --git a/system/otherLoadTest/playlist.xml b/system/otherLoadTest/playlist.xml index 98918eff29..64e779bcd1 100644 --- a/system/otherLoadTest/playlist.xml +++ b/system/otherLoadTest/playlist.xml @@ -51,10 +51,6 @@ hotspot .*windows.* - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 @@ -90,10 +86,6 @@ hotspot .*windows.* - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 @@ -133,10 +125,6 @@ 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); \ @@ -169,12 +157,6 @@ ClassLoadingTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -251,10 +233,6 @@ hotspot riscv64_linux - - https://github.com/adoptium/STF/issues/142 - 24+ - Mode150 @@ -273,12 +251,6 @@ DBBLoadTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -296,12 +268,6 @@ LangLoadTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -318,12 +284,6 @@ LockingLoadTest - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -342,12 +302,6 @@ NioLoadTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -365,12 +319,6 @@ UtilLoadTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode150 Mode650 @@ -463,12 +411,6 @@ HeapHogLoadTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -488,12 +430,6 @@ ObjectTreeLoadTest_5m - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -514,12 +450,6 @@ 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 79c86aba9f..a9b1771952 100644 --- a/system/sharedClasses/playlist.xml +++ b/system/sharedClasses/playlist.xml @@ -24,12 +24,6 @@ SharedClassesAPI - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 @@ -50,12 +44,6 @@ SharedClassesWorkload - - - https://github.com/adoptium/STF/issues/142 - 24+ - - Mode110 Mode610 diff --git a/system/system.mk b/system/system.mk index 3f4d48fe63..979f930225 100644 --- a/system/system.mk +++ b/system/system.mk @@ -50,11 +50,7 @@ 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-23. -# Related: https://github.com/eclipse-openj9/openj9/issues/14412 +# This is needed for Mauve tests that use the SecurityManager. 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)')