Skip to content

Commit 37f795c

Browse files
annaibmannaibm
committed
Enable Balanced GC for test variations
- Enable functional tests to run on balanced GC modes for Jenkins - Exclude threadMXBeanTimedParkTest for Balanced GC on ZOS - Exclude testSCCMLAotMethodOperation for Mode110 and Mode501 on ZOS related:https://github.ibm.com/runtimes/automation/issues/125 Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
1 parent 3fcd552 commit 37f795c

File tree

8 files changed

+66
-0
lines changed

8 files changed

+66
-0
lines changed

‎test/functional/Java8andUp/playlist.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
109109
<variations>
110110
<variation>Mode110</variation>
111111
<variation>Mode150</variation>
112+
<variation>Mode501</variation>
113+
<variation>Mode551</variation>
112114
</variations>
113115
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
114116
$(ADD_EXPORTS_JDK_INTERNAL_REFLECT) $(ADD_EXPORTS_JDK_INTERNAL_MISC) \
@@ -1878,6 +1880,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
18781880
<variation>Mode301 -Xjit:noJitUntilMain,count=0,optlevel=warm</variation>
18791881
<variation>Mode351 -Xjit:noJitUntilMain,count=0,optlevel=warm</variation>
18801882
<variation>Mode610 -Xjit:noJitUntilMain,count=0,optlevel=warm</variation>
1883+
<variation>Mode500</variation>
1884+
<variation>Mode550</variation>
1885+
<variation>Mode501 -Xjit:noJitUntilMain,count=0,optlevel=warm</variation>
1886+
<variation>Mode551 -Xjit:noJitUntilMain,count=0,optlevel=warm</variation>
18811887
</variations>
18821888
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
18831889
$(JAVA_COMMAND) $(JVM_OPTIONS) \
@@ -1910,6 +1916,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
19101916
<variation>Mode301</variation>
19111917
<variation>Mode351</variation>
19121918
<variation>Mode610</variation>
1919+
<variation>Mode501</variation>
1920+
<variation>Mode551</variation>
19131921
</variations>
19141922
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
19151923
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \
@@ -1933,11 +1941,25 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
19331941
</test>
19341942
<test>
19351943
<testCaseName>threadMXBeanTimedParkTest</testCaseName>
1944+
<disables>
1945+
<disable>
1946+
<comment>https://github.ibm.com/runtimes/backlog/issues/1720</comment>
1947+
<variation>Mode501 -Xthr:minimizeUserCPU</variation>
1948+
<platform>.*zos.*</platform>
1949+
</disable>
1950+
<disable>
1951+
<comment>https://github.ibm.com/runtimes/backlog/issues/1720</comment>
1952+
<variation>Mode551 -Xthr:minimizeUserCPU</variation>
1953+
<platform>.*zos.*</platform>
1954+
</disable>
1955+
</disables>
19361956
<variations>
19371957
<variation>Mode110 -Xthr:minimizeUserCPU</variation>
19381958
<variation>Mode301 -Xthr:minimizeUserCPU</variation>
19391959
<variation>Mode351 -Xthr:minimizeUserCPU</variation>
19401960
<variation>Mode610 -Xthr:minimizeUserCPU</variation>
1961+
<variation>Mode501 -Xthr:minimizeUserCPU</variation>
1962+
<variation>Mode551 -Xthr:minimizeUserCPU</variation>
19411963
</variations>
19421964
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
19431965
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \
@@ -1966,6 +1988,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
19661988
<variation>Mode301</variation>
19671989
<variation>Mode351</variation>
19681990
<variation>Mode610</variation>
1991+
<variation>Mode501</variation>
1992+
<variation>Mode551</variation>
19691993
</variations>
19701994
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
19711995
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \
@@ -2169,6 +2193,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
21692193
<variation>Mode610</variation>
21702194
<variation>Mode301</variation>
21712195
<variation>Mode351</variation>
2196+
<variation>Mode501</variation>
21722197
<variation>Mode551</variation>
21732198
</variations>
21742199
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \

‎test/functional/cmdLineTests/URLClassLoaderTests/playlist.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<variations>
2828
<variation>Mode110</variation>
2929
<variation>Mode610</variation>
30+
<variation>Mode501</variation>
31+
<variation>Mode551</variation>
3032
</variations>
3133
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
3234
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
@@ -56,6 +58,8 @@
5658
<variations>
5759
<variation>Mode110</variation>
5860
<variation>Mode610</variation>
61+
<variation>Mode501</variation>
62+
<variation>Mode551</variation>
5963
</variations>
6064
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
6165
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
@@ -85,6 +89,8 @@
8589
<variations>
8690
<variation>Mode110</variation>
8791
<variation>Mode610</variation>
92+
<variation>Mode501</variation>
93+
<variation>Mode551</variation>
8894
</variations>
8995
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
9096
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
@@ -114,6 +120,8 @@
114120
<variations>
115121
<variation>Mode110</variation>
116122
<variation>Mode610</variation>
123+
<variation>Mode501</variation>
124+
<variation>Mode551</variation>
117125
</variations>
118126
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
119127
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \

‎test/functional/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,23 @@
382382
</test>
383383
<test>
384384
<testCaseName>testSCCMLAotMethodOperation</testCaseName>
385+
<disables>
386+
<disable>
387+
<comment>https://github.com/eclipse-openj9/openj9/issues/22734</comment>
388+
<variation>Mode110</variation>
389+
<platform>.*zos.*</platform>
390+
</disable>
391+
<disable>
392+
<comment>https://github.com/eclipse-openj9/openj9/issues/22734</comment>
393+
<variation>Mode501</variation>
394+
<platform>.*zos.*</platform>
395+
</disable>
396+
</disables>
385397
<variations>
386398
<variation>Mode110</variation>
387399
<variation>Mode610</variation>
400+
<variation>Mode501</variation>
401+
<variation>Mode551</variation>
388402
</variations>
389403
<command>$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) \
390404
-DPATHSEP=$(Q)$(D)$(Q) -DCPDL=$(Q)$(P)$(Q) -DRUN_SCRIPT=$(RUN_SCRIPT) -DPROPS_DIR=$(PROPS_DIR) -DSCRIPT_SUFFIX=$(SCRIPT_SUFFIX) -DEXECUTABLE_SUFFIX=$(EXECUTABLE_SUFFIX) \
@@ -414,6 +428,8 @@
414428
<variations>
415429
<variation>Mode110</variation>
416430
<variation>Mode610</variation>
431+
<variation>Mode501</variation>
432+
<variation>Mode551</variation>
417433
</variations>
418434
<command>cp $(Q)$(JVM_TEST_ROOT)$(D)functional$(D)cmdLineTests$(D)utils$(D)utils.jar$(Q) .; \
419435
true utils.jar ;\
@@ -449,6 +465,8 @@
449465
<variations>
450466
<variation>Mode110</variation>
451467
<variation>Mode610</variation>
468+
<variation>Mode501</variation>
469+
<variation>Mode551</variation>
452470
</variations>
453471
<command>$(MKTREE) $(REPORTDIR); \
454472
$(CD) $(REPORTDIR); \
@@ -482,6 +500,8 @@
482500
<variations>
483501
<variation>Mode110</variation>
484502
<variation>Mode610</variation>
503+
<variation>Mode501</variation>
504+
<variation>Mode551</variation>
485505
</variations>
486506
<command>$(MKTREE) $(REPORTDIR); \
487507
$(CD) $(REPORTDIR); \

‎test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/playlist.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<variations>
3030
<variation>Mode110</variation>
3131
<variation>Mode610</variation>
32+
<variation>Mode501</variation>
33+
<variation>Mode551</variation>
3234
</variations>
3335
<command>cp $(Q)$(TEST_RESROOT)$(D)SCCommandLineOptionTests.jar$(Q) .; \
3436
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) xf SCCommandLineOptionTests.jar; \

‎test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/playlist.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<variations>
3535
<variation>Mode110</variation>
3636
<variation>Mode610</variation>
37+
<variation>Mode501</variation>
38+
<variation>Mode551</variation>
3739
</variations>
3840
<command>cp $(Q)$(TEST_RESROOT)$(D)HelperCompatibilityTests.jar$(Q) .; \
3941
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar.exe$(Q) xf HelperCompatibilityTests.jar; \
@@ -61,6 +63,8 @@
6163
<variations>
6264
<variation>Mode110</variation>
6365
<variation>Mode610</variation>
66+
<variation>Mode501</variation>
67+
<variation>Mode551</variation>
6468
</variations>
6569
<command>cp $(Q)$(TEST_RESROOT)$(D)HelperCompatibilityTests.jar$(Q) .; \
6670
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(Q) xf HelperCompatibilityTests.jar; \

‎test/functional/cmdLineTests/shareClassTests/StoreFilterTests/playlist.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<testCaseName>cmdLineTester_StoreFilterTests_win</testCaseName>
2828
<variations>
2929
<variation>Mode110</variation>
30+
<variation>Mode501</variation>
3031
</variations>
3132
<command>cp $(Q)$(TEST_RESROOT)$(D)StoreFilterTests.jar$(Q) .; \
3233
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar.exe$(Q) xf StoreFilterTests.jar; \

‎test/functional/cmdLineTests/shareClassTests/URLHelperTests/playlist.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<variations>
2828
<variation>Mode110</variation>
2929
<variation>Mode610</variation>
30+
<variation>Mode501</variation>
31+
<variation>Mode551</variation>
3032
</variations>
3133
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLHelperTests.jar$(Q) .; \
3234
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLHelperTests.jar; \
@@ -59,6 +61,8 @@
5961
<variations>
6062
<variation>Mode110</variation>
6163
<variation>Mode610</variation>
64+
<variation>Mode501</variation>
65+
<variation>Mode551</variation>
6266
</variations>
6367
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLHelperTests.jar$(Q) .; \
6468
$(Q)$(TEST_JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLHelperTests.jar; \

‎test/functional/cmdLineTests/shrcdbgddrext/playlist.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
3434
<variation>Mode110</variation>
3535
<variation>Mode610</variation>
3636
<variation>Mode201</variation>
37+
<variation>Mode501</variation>
38+
<variation>Mode551</variation>
3739
</variations>
3840
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
3941
cp $(CMDLINETESTER_RESJAR) .; \

0 commit comments

Comments
 (0)