Skip to content

Commit

Permalink
Support openj9 to run openjdk custom target (adoptium#5370)
Browse files Browse the repository at this point in the history
- Leveraging hotspot_custom to support openj9 to run openjdk custom target

Signed-off-by: LongyuZhang <longyu.zhang@ibm.com>
  • Loading branch information
LongyuZhang authored Jun 7, 2024
1 parent 0f15089 commit bc92b7d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
3 changes: 2 additions & 1 deletion buildenv/jenkins/JenkinsfileBase
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,8 @@ def runTest( ) {
env.SYSTEM_CUSTOM_TARGET=CUSTOM_TARGET
} else {
// remove suffix, then set CUSTOM_OPTION (i.e., jdk_custom_0 will become jdk_custom)
def removeSuffix = TARGET.replaceAll(/_\d+$/, "")
def removeDisabled = TARGET.replaceAll("disabled.", "")
def removeSuffix = removeDisabled.replaceAll(/_\d+$/, "")
CUSTOM_OPTION = "${removeSuffix.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
}
}
Expand Down
15 changes: 11 additions & 4 deletions openjdk/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,23 @@
</test>
<test>
<testCaseName>hotspot_custom</testCaseName>
<disables>
<disable>
<comment>https://github.com/adoptium/aqa-tests/issues/5357</comment>
<impl>openj9</impl>
</disable>
<disable>
<comment>https://github.com/adoptium/aqa-tests/issues/5357</comment>
<impl>ibm</impl>
</disable>
</disables>
<variations>
<variation>Mode150</variation>
<variation>Mode650</variation>
<variation>Mode1000</variation>
</variations>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(TIMEOUT_HANDLER) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
Expand All @@ -115,9 +125,6 @@
<groups>
<group>openjdk</group>
</groups>
<impls>
<impl>hotspot</impl>
</impls>
</test>
<test>
<testCaseName>hotspot_container</testCaseName>
Expand Down

0 comments on commit bc92b7d

Please sign in to comment.