From b04dbca240360dcec777eedec6138a187cac25b8 Mon Sep 17 00:00:00 2001 From: andrlos <80903703+andrlos@users.noreply.github.com> Date: Wed, 5 Nov 2025 23:52:59 +0100 Subject: [PATCH 1/9] update playlist to use the JAVA_TO_TEST variable for testing --- .../testHeadlessComponents/playlist.xml | 36 ++----------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml index c22aa7a73d..8e2c553d56 100644 --- a/functional/testHeadlessComponents/playlist.xml +++ b/functional/testHeadlessComponents/playlist.xml @@ -15,41 +15,9 @@ TestHeadlessComponents - - - https://github.com/adoptium/aqa-tests/issues/5224 - openj9 - - - https://github.com/adoptium/aqa-tests/issues/5224 - ibm - - - https://github.com/adoptium/aqa-tests/issues/6647#issuecomment-3382932623 - aarch64_mac - hotspot - - - https://github.com/adoptium/aqa-tests/pull/6648#issuecomment-3397002761 - x86-64_windows - hotspot - 8 - - - https://github.com/adoptium/aqa-tests/issues/5775 - x86-64_mac - hotspot - 8 - - - https://github.com/adoptium/aqa-tests/pull/6616#issuecomment-3323705754 - x86-64_mac - hotspot - 25 - - - export OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK="jdk" TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ + $(JAVA_TO_TEST) -version; \ + export JAVA_COMMAND=$(JAVA_COMMAND) JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK="jdk" TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \ $(TEST_STATUS) From 3ee66a3c745d53154fd96e5df423a5bc993d1b6b Mon Sep 17 00:00:00 2001 From: andrlos <80903703+andrlos@users.noreply.github.com> Date: Wed, 5 Nov 2025 23:54:01 +0100 Subject: [PATCH 2/9] Update build.xml to use the JAVA_TO_TEST variable for testing --- functional/testHeadlessComponents/build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/functional/testHeadlessComponents/build.xml b/functional/testHeadlessComponents/build.xml index 325cc9b562..d7b629442d 100644 --- a/functional/testHeadlessComponents/build.xml +++ b/functional/testHeadlessComponents/build.xml @@ -45,6 +45,8 @@ + + From 0858f3064db068b1fbe222c4c97d2e7f98cb2ddf Mon Sep 17 00:00:00 2001 From: andrlos <80903703+andrlos@users.noreply.github.com> Date: Fri, 7 Nov 2025 18:46:31 +0100 Subject: [PATCH 3/9] Update build.xml change target test branch --- functional/testHeadlessComponents/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functional/testHeadlessComponents/build.xml b/functional/testHeadlessComponents/build.xml index d7b629442d..748166b0bc 100644 --- a/functional/testHeadlessComponents/build.xml +++ b/functional/testHeadlessComponents/build.xml @@ -46,7 +46,7 @@ - + From 16c8964f0d4fd97b0cdf0151dd5000d223415357 Mon Sep 17 00:00:00 2001 From: andrlos <80903703+andrlos@users.noreply.github.com> Date: Mon, 10 Nov 2025 20:28:49 +0100 Subject: [PATCH 4/9] Update build.xml download submodules for the repo --- functional/testHeadlessComponents/build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/functional/testHeadlessComponents/build.xml b/functional/testHeadlessComponents/build.xml index 748166b0bc..63354357ff 100644 --- a/functional/testHeadlessComponents/build.xml +++ b/functional/testHeadlessComponents/build.xml @@ -47,6 +47,7 @@ + From 61b4aeec9bdf0cabc6a58d0e6f0893776af6cc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= Date: Fri, 5 Dec 2025 21:02:03 +0100 Subject: [PATCH 5/9] special branch no longer needed, as changes were merged to master --- functional/testHeadlessComponents/build.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/functional/testHeadlessComponents/build.xml b/functional/testHeadlessComponents/build.xml index 63354357ff..1a3b995eb0 100644 --- a/functional/testHeadlessComponents/build.xml +++ b/functional/testHeadlessComponents/build.xml @@ -45,8 +45,6 @@ - - From 639ab062e3aeaa4c692913432795ab00cbb26c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= Date: Fri, 5 Dec 2025 21:17:06 +0100 Subject: [PATCH 6/9] forgot about usage of USE_JRE to figure out whether we test jre or jdk --- functional/testHeadlessComponents/playlist.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml index 8e2c553d56..741fb910b7 100644 --- a/functional/testHeadlessComponents/playlist.xml +++ b/functional/testHeadlessComponents/playlist.xml @@ -17,7 +17,8 @@ TestHeadlessComponents $(JAVA_TO_TEST) -version; \ - export JAVA_COMMAND=$(JAVA_COMMAND) JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK="jdk" TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ + case "$USE_JRE" in true) JREJDK=jre ;; *) JREJDK=jdk ;; esac; \ + export JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \ $(TEST_STATUS) From 49f051805735115b976eed7bdfd5dfc6e8f25d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= Date: Fri, 5 Dec 2025 21:38:23 +0100 Subject: [PATCH 7/9] wrong escaping of USE_JRE --- functional/testHeadlessComponents/playlist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml index 741fb910b7..a77ae7baa6 100644 --- a/functional/testHeadlessComponents/playlist.xml +++ b/functional/testHeadlessComponents/playlist.xml @@ -17,7 +17,7 @@ TestHeadlessComponents $(JAVA_TO_TEST) -version; \ - case "$USE_JRE" in true) JREJDK=jre ;; *) JREJDK=jdk ;; esac; \ + case "$(USE_JRE)" in true) JREJDK=jre ;; *) JREJDK=jdk ;; esac; \ export JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \ $(TEST_STATUS) From d3f6084af8cf6396a37c5045f3ed2af4afba95d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= Date: Tue, 9 Dec 2025 22:54:28 +0100 Subject: [PATCH 8/9] ditching the JAVA_TO_TEST version --- functional/testHeadlessComponents/playlist.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml index a77ae7baa6..ce174c3da9 100644 --- a/functional/testHeadlessComponents/playlist.xml +++ b/functional/testHeadlessComponents/playlist.xml @@ -16,7 +16,6 @@ TestHeadlessComponents - $(JAVA_TO_TEST) -version; \ case "$(USE_JRE)" in true) JREJDK=jre ;; *) JREJDK=jdk ;; esac; \ export JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \ From 37d27a17f6c430b222365e189d0995fa102ed70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= Date: Wed, 10 Dec 2025 10:02:17 +0100 Subject: [PATCH 9/9] disabling openj9 and ibm vendor and leaving only hotspot for now --- functional/testHeadlessComponents/playlist.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml index ce174c3da9..90024d5236 100644 --- a/functional/testHeadlessComponents/playlist.xml +++ b/functional/testHeadlessComponents/playlist.xml @@ -15,7 +15,17 @@ TestHeadlessComponents - + + + https://github.com/adoptium/aqa-tests/issues/5224 + openj9 + + + https://github.com/adoptium/aqa-tests/issues/5224 + ibm + + + case "$(USE_JRE)" in true) JREJDK=jre ;; *) JREJDK=jdk ;; esac; \ export JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \ bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \