Support multiple jdk custom targets (#4136)

* Support multiple jdk custom target Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Remove unnecessary if condition Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
adoptium · Nov 10, 2022 · 9e3b5f6 · 9e3b5f6
1 parent 34dc112
commit 9e3b5f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
@@ -119,9 +119,6 @@ else
 OPENJDK_DIR := $(TEST_ROOT)$(D)openjdk$(D)openjdk-jdk
 endif
 
-JDK_CUSTOM_TARGET ?= java/math/BigInteger/BigIntegerTest.java
-HOTSPOT_CUSTOM_TARGET ?= gc/stress/gclocker/TestExcessGCLockerCollections.java
-LANGTOOLS_CUSTOM_TARGET ?= tools/javac/4241573/T4241573.java
 ifneq (,$(findstring $(JDK_VERSION),8-9))
 	JTREG_JDK_TEST_DIR := $(OPENJDK_DIR)$(D)jdk$(D)test
 	JTREG_HOTSPOT_TEST_DIR := $(OPENJDK_DIR)$(D)hotspot$(D)test
@@ -132,6 +129,11 @@ else
 	JTREG_LANGTOOLS_TEST_DIR := $(OPENJDK_DIR)$(D)test$(D)langtools
 endif
 
+JDK_CUSTOM_TARGET ?= java/math/BigInteger/BigIntegerTest.java
+HOTSPOT_CUSTOM_TARGET ?= gc/stress/gclocker/TestExcessGCLockerCollections.java
+LANGTOOLS_CUSTOM_TARGET ?= tools/javac/4241573/T4241573.java
+FULLPATH_JDK_CUSTOM_TARGET = $(foreach target,$(JDK_CUSTOM_TARGET),$(JTREG_JDK_TEST_DIR)$(D)$(target))
+
 JDK_NATIVE_OPTIONS :=
 JVM_NATIVE_OPTIONS :=
 CUSTOM_NATIVE_OPTIONS :=

diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
@@ -27,7 +27,7 @@
 	-w $(Q)$(REPORTDIR)$(D)work$(Q) \
 	-r $(Q)$(REPORTDIR)$(D)report$(Q) \
 	-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-	$(Q)$(JTREG_JDK_TEST_DIR)$(D)$(JDK_CUSTOM_TARGET)$(Q); \
+	$(FULLPATH_JDK_CUSTOM_TARGET); \
 	$(TEST_STATUS)</command>
 		<levels>
 			<level>extended</level>