From ab417f6e05737b30d3c700d8d30a6a1e9734919d Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Thu, 13 Mar 2025 14:24:11 +0000 Subject: [PATCH 01/20] Start/stop agent with every vm/jdwp test --- jck/jck-jdwp-test-drive.sh | 48 +++++++++++++++++++++++++++++++++++++ jck/jck.mk | 1 + jck/runtime.vm/playlist.xml | 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 jck/jck-jdwp-test-drive.sh diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh new file mode 100644 index 0000000000..3c41fc22d3 --- /dev/null +++ b/jck/jck-jdwp-test-drive.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +jckAgentPID=0 +harnessExitCode=0 +tnameservPID=0 + +startJCKAgent() { + echo "Starting JCK agent.." + eval $1 + jckAgentPID=$! + echo "Agent started with PID $jckAgentPID" +} + +stopJCKAgent() { + echo "Test complete. Stopping JCK Agent.." + kill -9 $jckAgentPID +} + +startTNameServ() { + echo "Starting TNAMESERV.." + eval $1 + tnameservPID=$! + echo "TNAMESERV started with PID $tnameservPID" +} + +startJCKHarness() { + echo "Starting JCK harness.." + eval $1; return $? +} + +stopTNameServ() { + echo "Stopping TNAMESERV.." + kill -9 $tnameservPID +} + +# Query all of the tests in $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/ +find $4 -type f -name "*.java" | while read -r test; +do + startJCKAgent + # cp generated.jtb temp_jdwp.jtb + # Replace tests=vm/jdwp line with tests= + # Not sure what to do here ^^ + startTNameServ "$2" + startJCKHarness "$3" + harnessExitCode=$? + stopTNameServ + stopJCKAgent +done \ No newline at end of file diff --git a/jck/jck.mk b/jck/jck.mk index 3b538f5e3c..fc25043a97 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -174,6 +174,7 @@ EXEC_RUNTIME_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_N EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' '$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/' EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index c71e51cced..ca56c417cd 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -55,7 +55,7 @@ NoOptions $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ - $(EXEC_RUNTIME_TEST_WITH_AGENT); \ + $(EXEC_RUNTIME_TEST_JDWP); \ $(TEST_STATUS) ; \ $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME From 311c6f71df13ebd1586b2ab648bcb4172e44ba77 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 14 Mar 2025 11:56:05 +0000 Subject: [PATCH 02/20] sed command --- jck/jck-jdwp-test-drive.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 3c41fc22d3..7e34228ce6 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -39,6 +39,7 @@ do startJCKAgent # cp generated.jtb temp_jdwp.jtb # Replace tests=vm/jdwp line with tests= + sed -i -e 's/tests vm/jdwp/tests $test/g' # Not sure what to do here ^^ startTNameServ "$2" startJCKHarness "$3" From 7781d2def7fbd1beaeffad3fc156c8d8a7b923cf Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Tue, 18 Mar 2025 13:10:53 +0000 Subject: [PATCH 03/20] Timeout, pass generated jtb to script --- jck/jck-jdwp-test-drive.sh | 47 +++++++++++++++++++------------------ jck/jck.mk | 3 ++- jck/runtime.vm/playlist.xml | 32 +++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 26 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 7e34228ce6..0776ec7790 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -2,7 +2,7 @@ jckAgentPID=0 harnessExitCode=0 -tnameservPID=0 +jckHarnessPID=0 startJCKAgent() { echo "Starting JCK agent.." @@ -16,34 +16,35 @@ stopJCKAgent() { kill -9 $jckAgentPID } -startTNameServ() { - echo "Starting TNAMESERV.." - eval $1 - tnameservPID=$! - echo "TNAMESERV started with PID $tnameservPID" -} - startJCKHarness() { echo "Starting JCK harness.." - eval $1; return $? + eval $1 + jckHarnessPID=$! } -stopTNameServ() { - echo "Stopping TNAMESERV.." - kill -9 $tnameservPID +queryVmJdwpTest() { + java -cp /home/jenkins/jck_root/JCK8-unzipped/JCK-runtime-8d/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end /home/jenkins/jck_root/JCK8-unzipped/JCK-runtime-8d/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" } + # Query all of the tests in $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/ -find $4 -type f -name "*.java" | while read -r test; +queryVmJdwpTest | while read -r test; do - startJCKAgent - # cp generated.jtb temp_jdwp.jtb - # Replace tests=vm/jdwp line with tests= - sed -i -e 's/tests vm/jdwp/tests $test/g' - # Not sure what to do here ^^ - startTNameServ "$2" - startJCKHarness "$3" - harnessExitCode=$? - stopTNameServ + cp $3 temp_jdwp.jtb + # Replace tests=vm/jdwp line with tests= + sed -i -e "s/tests vm/jdwp/tests $test/g" temp_jdwp.jtb + startJCKAgent "$1" + startJCKHarness "$2" temp_jdwp.jtb + sleep 60 # 60 second timeout + if kill -s 0 $jckHarnessPID 2>nul; then + echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." + kill -9 $jckHarnessPID + harnessExitCode=124 + else + wait $jckHarnessPID + harnessExitCode=$? + fi stopJCKAgent -done \ No newline at end of file +done + +exit $harnessExitCode \ No newline at end of file diff --git a/jck/jck.mk b/jck/jck.mk index fc25043a97..ce76e36595 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -171,10 +171,11 @@ START_RMIREG = $(TEST_JDK_HOME)/bin/rmiregistry > $(REPORTDIR)$(D)rmiregistry.lo START_RMID = $(TEST_JDK_HOME)/bin/rmid -J-Dsun.rmi.activation.execPolicy=none -J-Djava.security.policy=$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/jck.policy > $(REPORTDIR)$(D)rmid.log & START_TNAMESRV = $(TEST_JDK_HOME)/bin/tnameserv -ORBInitialPort 9876 > $(REPORTDIR)$(D)tnameserv.log & EXEC_RUNTIME_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/runtime.jti @$(REPORTDIR)/generated.jtb +EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/runtime.jti EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' '$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/' +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index ca56c417cd..7b1af4471a 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -40,7 +40,7 @@ - jck-runtime-vm-jdwp + jck-runtime-vm-jdwp-jdk-8-11 backlog/issues/477 @@ -54,7 +54,7 @@ NoOptions - $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ $(EXEC_RUNTIME_TEST_JDWP); \ $(TEST_STATUS) ; \ $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME @@ -66,6 +66,34 @@ jck + + + jck-runtime-vm-jdwp + + + backlog/issues/477 + ibm + + + backlog/issues/477 + openj9 + + + + NoOptions + + $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ + $(EXEC_RUNTIME_TEST_WITH_AGENT); \ + $(TEST_STATUS) ; \ + $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME + + + sanity + + + jck + + jck-runtime-vm-jvmti From 8bcab8b26f61235b5a7fa9760b11dffd1ec854c0 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Wed, 19 Mar 2025 10:56:26 +0000 Subject: [PATCH 04/20] Debug --- jck/runtime.vm/playlist.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index 7b1af4471a..8e49bc4695 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -54,10 +54,15 @@ NoOptions + $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ $(EXEC_RUNTIME_TEST_JDWP); \ + $(TEST_STATUS) ; \ + $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME + sanity @@ -67,6 +72,8 @@ + jck-runtime-vm-jdwp From 06dca50f88bcf02d9510911af0ad9e53fbd29714 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Mon, 24 Mar 2025 12:15:51 +0000 Subject: [PATCH 05/20] pass TEST_STATUS and GEN_SUMMARY_GENERIC into script as parameters --- jck/jck-jdwp-test-drive.sh | 5 +++-- jck/jck.mk | 2 +- jck/runtime.vm/playlist.xml | 16 +++++++--------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 0776ec7790..b06d510ef7 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -30,11 +30,12 @@ queryVmJdwpTest() { # Query all of the tests in $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/ queryVmJdwpTest | while read -r test; do - cp $3 temp_jdwp.jtb + cp "$3" temp_jdwp.jtb # Replace tests=vm/jdwp line with tests= sed -i -e "s/tests vm/jdwp/tests $test/g" temp_jdwp.jtb startJCKAgent "$1" - startJCKHarness "$2" temp_jdwp.jtb + # $(TEST_STATUS) and $(GEN_SUMMARY_GENERIC) are passed into startJCKHarness + startJCKHarness "$2" temp_jdwp.jtb "$4" "$5" tests=$test testsuite=RUNTIME sleep 60 # 60 second timeout if kill -s 0 $jckHarnessPID 2>nul; then echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." diff --git a/jck/jck.mk b/jck/jck.mk index ce76e36595..527a649251 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -175,7 +175,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index 8e49bc4695..e215954730 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -54,15 +54,8 @@ NoOptions - $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ $(EXEC_RUNTIME_TEST_JDWP); \ - - $(TEST_STATUS) ; \ - - $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME - sanity @@ -70,10 +63,12 @@ jck + + 8 + 11 + - jck-runtime-vm-jdwp @@ -100,6 +95,9 @@ jck + + 17+ + jck-runtime-vm-jvmti From 1945a68b9ba05bff869d8c78e42db5389e1f5a27 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Mon, 24 Mar 2025 12:16:18 +0000 Subject: [PATCH 06/20] end of line --- jck/jck-jdwp-test-drive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index b06d510ef7..100291b801 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -48,4 +48,4 @@ do stopJCKAgent done -exit $harnessExitCode \ No newline at end of file +exit $harnessExitCode From a2600b5e6c97acb3717480266df09d11edf42332 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Tue, 25 Mar 2025 12:47:35 +0000 Subject: [PATCH 07/20] update jck path variable --- jck/jck-jdwp-test-drive.sh | 5 +++-- jck/jck.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 100291b801..5da5dbdb51 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -23,12 +23,13 @@ startJCKHarness() { } queryVmJdwpTest() { - java -cp /home/jenkins/jck_root/JCK8-unzipped/JCK-runtime-8d/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end /home/jenkins/jck_root/JCK8-unzipped/JCK-runtime-8d/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" + jck_root_path="$1/JCK-runtime-$2/" + java -cp $jck_root_path/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end $jck_root_path/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" } # Query all of the tests in $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/ -queryVmJdwpTest | while read -r test; +queryVmJdwpTest "$6" "$7" | while read -r test; do cp "$3" temp_jdwp.jtb # Replace tests=vm/jdwp line with tests= diff --git a/jck/jck.mk b/jck/jck.mk index 527a649251..19575aa883 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -175,7 +175,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC)$(JCK_ROOT) $(JCK_VERSION_NUMBER) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) From cf3b509cbdb2cb7d5f4db1a91676e4487c91e295 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Tue, 25 Mar 2025 12:48:17 +0000 Subject: [PATCH 08/20] local variable --- jck/jck-jdwp-test-drive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 5da5dbdb51..299c2ad233 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -23,7 +23,7 @@ startJCKHarness() { } queryVmJdwpTest() { - jck_root_path="$1/JCK-runtime-$2/" + local jck_root_path="$1/JCK-runtime-$2/" java -cp $jck_root_path/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end $jck_root_path/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" } From d5164ddbf93894ee66cdf3a69fe912e61cce4fe8 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Tue, 1 Apr 2025 14:01:11 +0100 Subject: [PATCH 09/20] Pass in more parameters --- jck/jck-jdwp-test-drive.sh | 4 ++-- jck/jck.mk | 2 +- jck/runtime.vm/playlist.xml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 299c2ad233..edb0f14331 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -24,12 +24,12 @@ startJCKHarness() { queryVmJdwpTest() { local jck_root_path="$1/JCK-runtime-$2/" - java -cp $jck_root_path/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end $jck_root_path/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" + eval $3/bin/java -cp $jck_root_path/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end $jck_root_path/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" } # Query all of the tests in $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/tests/vm/jdwp/ -queryVmJdwpTest "$6" "$7" | while read -r test; +queryVmJdwpTest "$6" "$7" "$8" | while read -r test; do cp "$3" temp_jdwp.jtb # Replace tests=vm/jdwp line with tests= diff --git a/jck/jck.mk b/jck/jck.mk index 19575aa883..a18444b335 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -175,7 +175,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC)$(JCK_ROOT) $(JCK_VERSION_NUMBER) +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC)$(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index e215954730..3051e94be1 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -68,7 +68,6 @@ 11 - jck-runtime-vm-jdwp From 11e1366960c614cae59a7022f80fb0bf46dc5373 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Tue, 1 Apr 2025 14:06:13 +0100 Subject: [PATCH 10/20] Typo --- jck/runtime.vm/playlist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index 3051e94be1..6a6a5fbdc7 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -95,7 +95,7 @@ jck - 17+ + 17+ From 55e92a06896d1109572a9f8139e5fbef77dc4463 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Wed, 2 Apr 2025 14:06:01 +0100 Subject: [PATCH 11/20] typo --- jck/jck.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jck/jck.mk b/jck/jck.mk index a18444b335..beaf802118 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -175,7 +175,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC)$(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) From a9482f41739a30bbbb0f14fd9c45b51363cd2158 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Wed, 23 Apr 2025 15:26:39 +0100 Subject: [PATCH 12/20] Remove test status and gen from options --- jck/jck.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jck/jck.mk b/jck/jck.mk index beaf802118..36e04169a8 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -175,7 +175,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) From fffbb89206613e48246694920434f71123cbcfe7 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 16:08:32 +0100 Subject: [PATCH 13/20] Remove backslash --- jck/jck.mk | 2 +- jck/runtime.vm/playlist.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jck/jck.mk b/jck/jck.mk index 36e04169a8..beaf802118 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -175,7 +175,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index 6a6a5fbdc7..84a875752a 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -55,7 +55,7 @@ NoOptions $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ - $(EXEC_RUNTIME_TEST_JDWP); \ + $(EXEC_RUNTIME_TEST_JDWP) sanity From 1d463358e1425ee546732c362530053cc14ef77a Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 16:15:37 +0100 Subject: [PATCH 14/20] Add chmod command to jck-jdwp script --- jck/jck.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/jck/jck.mk b/jck/jck.mk index beaf802118..2ef1422325 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -162,6 +162,7 @@ else endif $(shell chmod +x $(TEST_ROOT)$(D)jck$(D)agent-drive.sh) +$(shell chmod +x $(TEST_ROOT)$(D)jck$(D)jck-jdwp-test-drive.sh) START_MULTI_JVM_COMP_TEST = $(TEST_ROOT)$(D)jck$(D)agent-drive.sh '$(START_AGENT)' '$(START_HARNESS)' GEN_JTB_GENERIC = $(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) workdir=$(REPORTDIR) configAltPath=$(CONFIG_ALT_PATH) testJava=$(JAVA_TO_TEST) riJava=$(JAVA_TO_TEST) task=cmdfilegen spec=$(SPEC) $(APPLICATION_OPTIONS) From d3cd6415f2698bab1c89f7019852afd0cfc38489 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 16:31:51 +0100 Subject: [PATCH 15/20] double quotes --- jck/jck-jdwp-test-drive.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index edb0f14331..9cb5d6f8a5 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -6,7 +6,7 @@ jckHarnessPID=0 startJCKAgent() { echo "Starting JCK agent.." - eval $1 + eval "$1" jckAgentPID=$! echo "Agent started with PID $jckAgentPID" } @@ -18,13 +18,13 @@ stopJCKAgent() { startJCKHarness() { echo "Starting JCK harness.." - eval $1 + eval "$1" jckHarnessPID=$! } queryVmJdwpTest() { local jck_root_path="$1/JCK-runtime-$2/" - eval $3/bin/java -cp $jck_root_path/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end $jck_root_path/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]" + eval "$3/bin/java -cp $jck_root_path/lib/javatest.jar com.sun.javatest.finder.ShowTests -finder com.sun.javatest.finder.HTMLTestFinder -end $jck_root_path/tests/testsuite.html -initial vm/jdwp | tr -d "[:blank:]"" } From 82819285870c790c4405de685977d79820177e91 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 16:54:08 +0100 Subject: [PATCH 16/20] Comment out timeout function to test --- jck/jck-jdwp-test-drive.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 9cb5d6f8a5..4877214073 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -37,15 +37,15 @@ do startJCKAgent "$1" # $(TEST_STATUS) and $(GEN_SUMMARY_GENERIC) are passed into startJCKHarness startJCKHarness "$2" temp_jdwp.jtb "$4" "$5" tests=$test testsuite=RUNTIME - sleep 60 # 60 second timeout - if kill -s 0 $jckHarnessPID 2>nul; then - echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." - kill -9 $jckHarnessPID - harnessExitCode=124 - else - wait $jckHarnessPID - harnessExitCode=$? - fi + # sleep 60 # 60 second timeout + # if kill -s 0 $jckHarnessPID 2>nul; then + # echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." + # kill -9 $jckHarnessPID + # harnessExitCode=124 + # else + # wait $jckHarnessPID + # harnessExitCode=$? + # fi stopJCKAgent done From 54e238903ba472f0eb2422f95f60d73c6de70597 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 17:00:39 +0100 Subject: [PATCH 17/20] debug --- jck/jck-jdwp-test-drive.sh | 18 +++++++++--------- jck/jck.mk | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 4877214073..9cb5d6f8a5 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -37,15 +37,15 @@ do startJCKAgent "$1" # $(TEST_STATUS) and $(GEN_SUMMARY_GENERIC) are passed into startJCKHarness startJCKHarness "$2" temp_jdwp.jtb "$4" "$5" tests=$test testsuite=RUNTIME - # sleep 60 # 60 second timeout - # if kill -s 0 $jckHarnessPID 2>nul; then - # echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." - # kill -9 $jckHarnessPID - # harnessExitCode=124 - # else - # wait $jckHarnessPID - # harnessExitCode=$? - # fi + sleep 60 # 60 second timeout + if kill -s 0 $jckHarnessPID 2>nul; then + echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." + kill -9 $jckHarnessPID + harnessExitCode=124 + else + wait $jckHarnessPID + harnessExitCode=$? + fi stopJCKAgent done diff --git a/jck/jck.mk b/jck/jck.mk index 2ef1422325..c354ea1f7a 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -176,7 +176,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) +# EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) From 3d5701cfd923f56c70fdd5721c891e925266009b Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 17:04:23 +0100 Subject: [PATCH 18/20] debug --- jck/runtime.vm/playlist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index 84a875752a..c24fa96374 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -55,7 +55,7 @@ NoOptions $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ - $(EXEC_RUNTIME_TEST_JDWP) + sanity From c009a66b063c54279da9bb8faa76d36f9bd98c06 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 17:05:19 +0100 Subject: [PATCH 19/20] debug --- jck/runtime.vm/playlist.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index c24fa96374..c800a1eaff 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -63,10 +63,10 @@ jck - + jck-runtime-vm-jdwp From e31bb5554cb2f9f62076b4a6f0b10d5325a7cdee Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 25 Apr 2025 17:15:47 +0100 Subject: [PATCH 20/20] debug --- jck/jck-jdwp-test-drive.sh | 3 ++- jck/jck.mk | 2 +- jck/runtime.vm/playlist.xml | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jck/jck-jdwp-test-drive.sh b/jck/jck-jdwp-test-drive.sh index 9cb5d6f8a5..ed4c5886e2 100644 --- a/jck/jck-jdwp-test-drive.sh +++ b/jck/jck-jdwp-test-drive.sh @@ -36,7 +36,8 @@ do sed -i -e "s/tests vm/jdwp/tests $test/g" temp_jdwp.jtb startJCKAgent "$1" # $(TEST_STATUS) and $(GEN_SUMMARY_GENERIC) are passed into startJCKHarness - startJCKHarness "$2" temp_jdwp.jtb "$4" "$5" tests=$test testsuite=RUNTIME + # startJCKHarness "$2" temp_jdwp.jtb "$4" "$5" tests=$test testsuite=RUNTIME + startJCKHarness "$2" temp_jdwp.jtb tests=$test testsuite=RUNTIME sleep 60 # 60 second timeout if kill -s 0 $jckHarnessPID 2>nul; then echo "Testcase $test : Process $jckHarnessPID is still running after 60 seconds... killing..." diff --git a/jck/jck.mk b/jck/jck.mk index c354ea1f7a..d9de8b25e5 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -176,7 +176,7 @@ EXEC_RUNTIME_TEST_NO_JTB = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VE EXEC_COMPILER_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' -# EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(TEST_STATUS) $(GEN_SUMMARY_GENERIC) $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) +EXEC_RUNTIME_TEST_JDWP = $(TEST_ROOT)/jck/jck-jdwp-test-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST_NO_JTB)' @$(REPORTDIR)/generated.jtb $(JCK_ROOT) $(JCK_VERSION_NUMBER) $(TEST_JDK_HOME) EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(EXEC_RUNTIME_TEST_WITH_AGENT) ifeq ($(JDK_VERSION), 8) diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index c800a1eaff..9f5cda29fd 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -55,7 +55,10 @@ NoOptions $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ - + $(EXEC_RUNTIME_TEST_JDWP) ; \ + + $(TEST_STATUS) ; \ + $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME sanity