Skip to content

Commit

Permalink
Updating JCK references for jck17 to jck17a (#5780)
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Farley <[email protected]>
  • Loading branch information
adamfarley authored Dec 19, 2024
1 parent 5a695f0 commit 7bb358e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 13 deletions.
10 changes: 9 additions & 1 deletion jck/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,15 @@
<property name="JCK_VERSION_USED" value="jck11a" />
</then>
<else>
<property name="JCK_VERSION_USED" value="jck${JDK_VERSION}" />
<if>
<equals arg1="${JDK_VERSION}" arg2="17" />
<then>
<property name="JCK_VERSION_USED" value="jck17a" />
</then>
<else>
<property name="JCK_VERSION_USED" value="jck${JDK_VERSION}" />
</else>
</if>
</else>
</if>
</else>
Expand Down
3 changes: 3 additions & 0 deletions jck/jck-semiauto-updater/jckupdater.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ setup(){
elif [[ $JCK_VERSION == "11" ]]; then
JCK=11a
JCK_FOLDER_SUFFIX="$JCK_VERSION"a
elif [[ $JCK_VERSION == "17" ]]; then
JCK=17a
JCK_FOLDER_SUFFIX="$JCK_VERSION"a
fi
echo "JCK_FOLDER_SUFFIX=" $JCK_FOLDER_SUFFIX
#check if given ARTIFACTORY_DOWNLOAD_URL is complete till JCK/tck to download material
Expand Down
3 changes: 3 additions & 0 deletions jck/jck.mk
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ endif
ifeq (11, $(JDK_VERSION))
JCK_VERSION_NUMBER = 11a
endif
ifeq (17, $(JDK_VERSION))
JCK_VERSION_NUMBER = 17a
endif

JCK_VERSION = jck$(JCK_VERSION_NUMBER)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#JavaTest Harness Configuration Interview
DESCRIPTION=JCK17 compiler template jti for STF automation
DESCRIPTION=JCK17a compiler template jti for STF automation
INTERVIEW=com.sun.jck.interview.JCKParameters
NAME=jck_compiler
# TESTSUITE example: /jck/jck17/JCK-compiler-17
# TESTSUITE example: /jck/jck17a/JCK-compiler-17a
TESTSUITE=will_be_set_by_test_automation_at_run_time
# WORKDIR example: /home/user/JCK-compiler-17
# WORKDIR example: /home/user/JCK-compiler-17a
WORKDIR=will_be_set_by_test_automation_at_run_time
jck.concurrency.concurrency=1
jck.env.compiler.agent.networkClassLoading=No
Expand Down Expand Up @@ -51,7 +51,7 @@ jck.env.compiler.testRmic.otherOpts=
jck.env.compiler.testRmic.outDirOpt=-d \#
jck.env.compiler.testRmic.v11Option=-v1.1
jck.env.compiler.testRmic.v12Option=-v1.2
jck.env.description=JCK17 compiler template jti for STF automation
jck.env.description=JCK17a compiler template jti for STF automation
jck.env.envName=jck_compiler
jck.env.moduleSystem.compilerOptions=compilerAddModsOptionTemplate\=--add-modules \#[,\#]\ncompilerModulePathOptionTemplate\=--module-path \#\ncompilerModuleSourcePathOptionTemplate\=--module-source-path \#\n
jck.env.moduleSystem.vmOptions=vmModuleEntryOptionTemplate\=\nvmModulePathOptionTemplate\=\nvmAddModsOptionTemplate\=\n
Expand All @@ -73,7 +73,7 @@ jck.env.testPlatform.remoteNetworking=Remote network support
jck.env.testPlatform.systemRoot=C\:\\windows
jck.env.testPlatform.typecheckerSpecific=Yes
jck.env.testPlatform.useAgent=No
# jck.excludeList.customFiles example: /jck/jck17/excludes/jck17.jtx\n/jck/jck17/excludes/jck17.kfl
# jck.excludeList.customFiles example: /jck/jck17a/excludes/jck17a.jtx\n/jck/jck17a/excludes/jck17a.kfl
jck.excludeList.customFiles=will_be_set_by_test_automation_at_run_time
jck.excludeList.excludeListType=custom
jck.excludeList.latestAutoCheck=No
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#JavaTest Harness Configuration Interview
DESCRIPTION=JCK17 runtime template jti for STF automation
DESCRIPTION=JCK17a runtime template jti for STF automation
INTERVIEW=com.sun.jck.interview.JCKParameters
LOCALE=en_US
NAME=jck_runtime
QUESTION=jck.end
# TESTSUITE example: /jck/jck17/JCK-runtime-17
# TESTSUITE example: /jck/jck17a/JCK-runtime-17a
TESTSUITE=will_be_set_by_test_automation_at_run_time
# WORKDIR example: /home/user/JCK-runtime-17
# WORKDIR example: /home/user/JCK-runtime-17a
WORKDIR=will_be_set_by_test_automation_at_run_time
jck.concurrency.concurrency=1
jck.env.description=JCK17 runtime template jti for STF automation
jck.env.description=JCK17a runtime template jti for STF automation
jck.env.envName=jck_runtime
jck.env.moduleSystem.compilerOptions=compilerAddModsOptionTemplate\=\ncompilerModulePathOptionTemplate\=\ncompilerModuleSourcePathOptionTemplate\=\n
jck.env.moduleSystem.vmOptions=vmModuleEntryOptionTemplate\=--module \#\nvmModulePathOptionTemplate\=--module-path \#\nvmAddModsOptionTemplate\=--add-modules \#[,\#]\n
Expand Down Expand Up @@ -117,7 +117,7 @@ jck.env.runtime.testExecute.cmdAsFile=will_be_set_by_test_automation_at_run_time
jck.env.runtime.testExecute.jarExecution=Yes
jck.env.runtime.testExecute.jarExecutionOpt=-jar \#
jck.env.runtime.testExecute.jmx=Yes
# jck.env.runtime.testExecute.jmxResourcePathFileValue example: /jck/jck17/natives/linux_x86-64
# jck.env.runtime.testExecute.jmxResourcePathFileValue example: /jck/jck17a/natives/linux_x86-64
jck.env.runtime.testExecute.jmxResourcePathFileValue=will_be_set_by_test_automation_at_run_time
jck.env.runtime.testExecute.jni=Yes
jck.env.runtime.testExecute.jvmti=Yes
Expand All @@ -128,7 +128,7 @@ jck.env.runtime.testExecute.libPath=environment variable
# jck.env.runtime.testExecute.libPathEnv example: LD_LIBRARY_PATH
jck.env.runtime.testExecute.libPathEnv=will_be_set_by_test_automation_at_run_time
jck.env.runtime.testExecute.moduleOptions=Yes
# jck.env.runtime.testExecute.nativeLibPathFileValue example: /jck/jck17/natives/linux_x86-64
# jck.env.runtime.testExecute.nativeLibPathFileValue example: /jck/jck17a/natives/linux_x86-64
jck.env.runtime.testExecute.nativeLibPathFileValue=will_be_set_by_test_automation_at_run_time
jck.env.runtime.testExecute.nativeLibrariesLocation=Yes
jck.env.runtime.testExecute.nativeLibsLinkage=dynamic
Expand Down Expand Up @@ -162,7 +162,7 @@ jck.env.testPlatform.remoteNetworking=Remote network support
jck.env.testPlatform.systemRoot=will_be_set_by_test_automation_at_run_time
jck.env.testPlatform.typecheckerSpecific=Yes
jck.env.testPlatform.useAgent=No
# jck.excludeList.customFiles example: /jck/jck17/excludes/jck17.jtx\n/jck/jck17/excludes/jck17.kfl
# jck.excludeList.customFiles example: /jck/jck17a/excludes/jck17a.jtx\n/jck/jck17a/excludes/jck17a.kfl
jck.excludeList.customFiles=will_be_set_by_test_automation_at_run_time
jck.excludeList.excludeListType=custom
jck.excludeList.latestAutoCheck=No
Expand Down

0 comments on commit 7bb358e

Please sign in to comment.