Skip to content

Commit 5b498a8

Browse files
committed
Support openj9 to run openjdk custom target
- Leveraging hotspot_custom to support openj9 to run openjdk custom target Signed-off-by: LongyuZhang <[email protected]>
1 parent 529a642 commit 5b498a8

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

buildenv/jenkins/JenkinsfileBase

+2-1
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,8 @@ def runTest( ) {
728728
env.SYSTEM_CUSTOM_TARGET=CUSTOM_TARGET
729729
} else {
730730
// remove suffix, then set CUSTOM_OPTION (i.e., jdk_custom_0 will become jdk_custom)
731-
def removeSuffix = TARGET.replaceAll(/_\d+$/, "")
731+
def removeDisabled = TARGET.replaceAll("disabled.", "")
732+
def removeSuffix = removeDisabled.replaceAll(/_\d+$/, "")
732733
CUSTOM_OPTION = "${removeSuffix.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
733734
}
734735
}

openjdk/playlist.xml

+11-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<variation>Mode1000</variation>
103103
</variations>
104104
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
105-
$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
105+
$(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
106106
$(TIMEOUT_HANDLER) \
107107
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
108108
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
@@ -115,9 +115,16 @@
115115
<groups>
116116
<group>openjdk</group>
117117
</groups>
118-
<impls>
119-
<impl>hotspot</impl>
120-
</impls>
118+
<disables>
119+
<disable>
120+
<comment>https://github.com/adoptium/aqa-tests/issues/5357</comment>
121+
<impl>openj9</impl>
122+
</disable>
123+
<disable>
124+
<comment>https://github.com/adoptium/aqa-tests/issues/5357</comment>
125+
<impl>ibm</impl>
126+
</disable>
127+
</disables>
121128
</test>
122129
<test>
123130
<testCaseName>hotspot_container</testCaseName>

0 commit comments

Comments
 (0)