Separate hotspot_custom test for j9

Separate hotspot_custom and hotspot_custom_j9 tests

Signed-off-by: LongyuZhang <longyu.zhang@ibm.com>

openjdk/openjdk.mk

@@ -172,9 +172,11 @@ endif
 
 JDK_CUSTOM_TARGET ?= java/math/BigInteger/BigIntegerTest.java
 HOTSPOT_CUSTOM_TARGET ?= gc/stress/gclocker/TestExcessGCLockerCollections.java
+HOTSPOT_CUSTOM_J9_TARGET ?= serviceability/jvmti/GetSystemProperty/JvmtiGetSystemPropertyTest.java
 LANGTOOLS_CUSTOM_TARGET ?= tools/javac/4241573/T4241573.java
 FULLPATH_JDK_CUSTOM_TARGET = $(foreach target,$(JDK_CUSTOM_TARGET),$(JTREG_JDK_TEST_DIR)$(D)$(target))
 FULLPATH_HOTSPOT_CUSTOM_TARGET = $(foreach target,$(HOTSPOT_CUSTOM_TARGET),$(JTREG_HOTSPOT_TEST_DIR)$(D)$(target))
+FULLPATH_HOTSPOT_CUSTOM_J9_TARGET = $(foreach target,$(HOTSPOT_CUSTOM_J9_TARGET),$(JTREG_HOTSPOT_TEST_DIR)$(D)$(target))
 
 JDK_NATIVE_OPTIONS :=
 JVM_NATIVE_OPTIONS :=

openjdk/playlist.xml

@@ -96,23 +96,13 @@
  </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) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
+ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
  $(TIMEOUT_HANDLER) \
  -w $(Q)$(REPORTDIR)$(D)work$(Q) \
  -r $(Q)$(REPORTDIR)$(D)report$(Q) \
@@ -125,6 +115,38 @@
  <groups>
  <group>openjdk</group>
  </groups>
+ <impls>
+ <impl>hotspot</impl>
+ </impls>
+ </test>
+ <test>
+ <testCaseName>hotspot_custom_j9</testCaseName>
+ <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) -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) \
+ -jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
+ $(FULLPATH_HOTSPOT_CUSTOM_J9_TARGET); \
+ $(TEST_STATUS)</command>
+ <versions>
+ <version>21+</version>
+ </versions>
+ <levels>
+ <level>special</level>
+ </levels>
+ <groups>
+ <group>openjdk</group>
+ </groups>
+ <impls>
+ <impl>openj9</impl>
+ <impl>ibm</impl>
+ </impls>
  </test>
  <test>
  <testCaseName>hotspot_container</testCaseName>