Update tests to use JavatestUtil

-This code updates the custom tests to use JavatestUtil instead of JavaTestRunner.

resolves: adoptium#4864

Signed-off-by: Anna Babu Palathingal <[email protected]>

Author: annaibm

jck/jck.mk

@@ -126,7 +126,8 @@ ifeq ($(USE_JRE),1)
   JAVA_TO_TEST = $(JRE_COMMAND)
 endif
 
-JCK_CMD_TEMPLATE = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavaTestRunner resultsRoot=$(REPORTDIR) testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) spec=$(SPEC) configAltPath=$(CONFIG_ALT_PATH) $(APPLICATION_OPTIONS)
+JCK_CMD_TEMPLATE = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) spec=$(SPEC) configAltPath=$(CONFIG_ALT_PATH) $(APPLICATION_OPTIONS)
+
 WORKSPACE=/home/jenkins/jckshare/workspace/output_$(UNIQUEID)/$@
 
 ifneq ($(filter aix_ppc-64 zos_390 linux_ppc-64_le linux_390-64, $(SPEC)),)

jck/jck_target_folder_check/jck_target_folder_check.sh

@@ -96,9 +96,9 @@ crossCheckTestFoldersIn() {
 		existingTargets=$( cat "${listOfExistingTargets}" )
 		if [[ ! " $existingTargets " =~ $tokenToSearch ]] ; then
 			echo "New test folder detected: $line | Please add target: jck-$tokenToSearch"
-			command='<command>$(JCK_CMD_TEMPLATE) -test-args=$(Q)tests='${tokens[1]}/${tokens[2]}',jckRoot=$(JCK_ROOT),jckversion=$(JCK_VERSION),testsuite='$testTypeToUpper'$(Q); \'
-			status='$(TEST_STATUS)</command>'
-			echo "<test>"
+            command='<command>$(JCK_CMD_TEMPLATE) tests='${tokens[1]}/${tokens[2]}' -DjckRoot=$(JCK_ROOT) -Djckversion=$(JCK_VERSION) -Dtestsuite='$testTypeToUpper'; \
+            $(TEST_STATUS)</command>'
+            echo "<test>"
 			echo "	<testCaseName>jck-$tokenToSearch</testCaseName>"
 			echo "	<variations>"
 			echo "		<variation>NoOptions</variation>"