diff --git a/buildenv/jenkins/testJobTemplate b/buildenv/jenkins/testJobTemplate
index 85dbcf025d..96bfdd1550 100644
--- a/buildenv/jenkins/testJobTemplate
+++ b/buildenv/jenkins/testJobTemplate
@@ -369,9 +369,8 @@ ARCH_OS_LIST.each { ARCH_OS ->
TARGET=jdk_custom (support multiple test cases separated by space, hotspot_custom works same
CUSTOM_TARGET=test/jdk/java/math/BigInteger/LargeValueExceptions.java java/math/BigInteger/BigIntegerTest.java
Example 3:
- TARGET=jck_custom
- CUSTOM_TARGET=lang/INFR/....html,testsuite=COMPILER
- Note: testsuite is optional. It can be set to [RUNTIME(default) | COMPILER | DEVTOOLS]
''')
+ TARGET=jckruntime_custom
+ CUSTOM_TARGET=lang/INFR/....html
''')
parameterSeparatorDefinition {
name('TEST_OPTIONS_PARAMS')
separatorStyle(separatorStyleCss)
diff --git a/jck/README.md b/jck/README.md
index 2c8bba507a..3daf24fdf1 100644
--- a/jck/README.md
+++ b/jck/README.md
@@ -41,11 +41,11 @@ This test directory contains:
# How-to Run customized JCK test targets
-There is a custom JCK test target `jck_custom`. This is used to run custom JCK test targets in any JCK testsuite. RUNTIME is the default testsuite.
+There are three custom JCK test targets `jckruntime_custom, jckcompiler_custom, jckdevtools_custom`. They are used to run custom JCK test targets in JCK runtime, compiler and devtools testsuites respectively. Take jckruntime_custom as example:
1. Follow the Steps 1 - 4 mentioned above.
-2. Export `JCK_CUSTOM_TARGET=` as an environment variable or pass it in when run as a make command. For example `export JCK_CUSTOM_TARGET=api/java_math`. If a testsuite other than the default is needed, provide that in JCK_CUSTOM_TARGET (e.g., JCK_CUSTOM_TARGET=lang/INFR/....html testsuite=COMPILER).
+2. Export `JCKRUNTIME_CUSTOM_TARGET=` as an environment variable or pass it in when run as a make command. For example `export JCKRUNTIME_CUSTOM_TARGET=api/java_math`.
3. Make sure the JCK test subset is available in JCK test material folder, a.k.a. `$(JCK_ROOT)`.
diff --git a/jck/compiler.api/playlist.xml b/jck/compiler.api/playlist.xml
index 867e7bdd9a..0fd3b41d5f 100644
--- a/jck/compiler.api/playlist.xml
+++ b/jck/compiler.api/playlist.xml
@@ -14,6 +14,23 @@
-->
../jck.mk
+
+ jckcompiler_custom
+
+ NoOptions
+
+ $(GEN_JTB_GENERIC) testsuite=COMPILER tests=$(JCKCOMPILER_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
+ $(EXEC_COMPILER_TEST); \
+ $(TEST_STATUS); \
+ $(GEN_SUMMARY_GENERIC) testsuite=COMPILER tests=$(JCKCOMPILER_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
+
+
+ extended
+
+
+ jck
+
+
jck-compiler-api-java_rmi
diff --git a/jck/devtools.java2schema/playlist.xml b/jck/devtools.java2schema/playlist.xml
index 0a11705507..b0b3c8d84e 100644
--- a/jck/devtools.java2schema/playlist.xml
+++ b/jck/devtools.java2schema/playlist.xml
@@ -13,6 +13,26 @@
-->
../jck.mk
+
+ jckdevtools_custom
+
+ NoOptions
+
+ $(GEN_JTB_GENERIC) testsuite=DEVTOOLS tests=$(JCKDEVTOOLS_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
+ $(EXEC_DEVTOOLS_TEST); \
+ $(TEST_STATUS); \
+ $(GEN_SUMMARY_GENERIC) testsuite=DEVTOOLS tests=$(JCKDEVTOOLS_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
+
+
+ extended
+
+
+ jck
+
+
+ 8
+
+
jck-devtools-java2schema-CustomizedMapping
diff --git a/jck/jck.mk b/jck/jck.mk
index de0590a1e2..08d4a1fb53 100644
--- a/jck/jck.mk
+++ b/jck/jck.mk
@@ -11,9 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##############################################################################
-ifndef JCK_CUSTOM_TARGET
-JCK_CUSTOM_TARGET ?=api/java_math/BigInteger
-endif
+JCKRUNTIME_CUSTOM_TARGET ?= api/java_math/BigInteger
+JCKCOMPILER_CUSTOM_TARGET ?= api/javax_lang/model/element/Element/index.html
+JCKDEVTOOLS_CUSTOM_TARGET ?= java2schema/CustomizedMapping/classes/XmlRootElement/name/Name001.html
# Environment variable OSTYPE is set to cygwin if running under cygwin.
# Set our own macro to indicate we're running under cygwin.
@@ -93,11 +93,6 @@ ifneq ($(filter openj9 ibm, $(JDK_IMPL)),)
endif
endif
-# If testsuite is not specified, default to RUNTIME
-ifeq (,$(findstring testsuite, $(JCK_CUSTOM_TARGET)))
- override JCK_CUSTOM_TARGET := $(JCK_CUSTOM_TARGET) testsuite=RUNTIME
-endif
-
# Additional JavaTestRunner options can be added via APPLICATION_OPTIONS
ifndef APPLICATION_OPTIONS
APPLICATION_OPTIONS :=
diff --git a/jck/jtrunner/JavatestUtil.java b/jck/jtrunner/JavatestUtil.java
index 0fe7b9ca44..e639df908d 100644
--- a/jck/jtrunner/JavatestUtil.java
+++ b/jck/jtrunner/JavatestUtil.java
@@ -857,7 +857,7 @@ private static boolean generateJTB() throws Exception {
}
// Only use default initial jtx exclude and disregard the rest of jck exclude lists
- // when running a test via jck_custom.
+ // when running a test via jck***_custom.
if (testArgs.get(IS_CUSTOM_TARGET) == null) {
fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + defaultJtxFullPath + " " + kflFullPath + " " + customJtx + "\";\n";
diff --git a/jck/runtime.api/playlist.xml b/jck/runtime.api/playlist.xml
index 0b2b3fbb96..03f6878001 100644
--- a/jck/runtime.api/playlist.xml
+++ b/jck/runtime.api/playlist.xml
@@ -12,18 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
-
../jck.mk
- jck_custom
+ jckruntime_custom
NoOptions
- $(GEN_JTB_GENERIC) tests=$(JCK_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
+ $(GEN_JTB_GENERIC) testsuite=RUNTIME tests=$(JCKRUNTIME_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
$(EXEC_RUNTIME_TEST); \
$(TEST_STATUS); \
- $(GEN_SUMMARY_GENERIC) tests=$(JCK_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
+ $(GEN_SUMMARY_GENERIC) testsuite=RUNTIME tests=$(JCKRUNTIME_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
extended