From 8a4a3388f725b242ffa98ec8bb0d0da220614358 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Mon, 11 Mar 2024 18:21:37 +0100
Subject: [PATCH 1/4] Removed jtreg call by the upstream wrapper

which is doing moreover the same
---
 functional/security/Crypto/playlist.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/functional/security/Crypto/playlist.xml b/functional/security/Crypto/playlist.xml
index 1a7686bfda..6721f8d8ec 100644
--- a/functional/security/Crypto/playlist.xml
+++ b/functional/security/Crypto/playlist.xml
@@ -31,13 +31,10 @@
 				<platform>.*solaris</platform>
 			</disable>
 		</disables>
-		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
-		-a -xml -v:fail,error,time,nopass,summary -Dcryptotests.skipAgentTests=1 -timeoutFactor:2 \
-		-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-		-r $(Q)$(REPORTDIR)$(D)report$(Q) \
-		-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-		$(Q)$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(Q); \
-		$(TEST_STATUS)</command>
+		<command>
+			cd $(Q)$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(Q); \
+			SKIP_AGENT_TESTS=1 ./run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
+		</command>
 		<features>
 			<feature>FIPS140_2:nonapplicable</feature>
 		</features>

From 8ec98003d74d4d49d2d2bcb7327093f53f52bd37 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Mon, 11 Mar 2024 19:07:02 +0100
Subject: [PATCH 2/4] moved out of the tmpresults

---
 functional/security/Crypto/playlist.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/functional/security/Crypto/playlist.xml b/functional/security/Crypto/playlist.xml
index 6721f8d8ec..79c7a4d7d5 100644
--- a/functional/security/Crypto/playlist.xml
+++ b/functional/security/Crypto/playlist.xml
@@ -32,8 +32,7 @@
 			</disable>
 		</disables>
 		<command>
-			cd $(Q)$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(Q); \
-			SKIP_AGENT_TESTS=1 ./run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
+			SKIP_AGENT_TESTS=1 $(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
 		</command>
 		<features>
 			<feature>FIPS140_2:nonapplicable</feature>

From dcf2b2bfea5f279659393593f21e6947e92c1ab5 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Thu, 14 Mar 2024 17:50:04 +0100
Subject: [PATCH 3/4] Removed build's download of jtreg as suite pulls its own

---
 functional/security/Crypto/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functional/security/Crypto/build.xml b/functional/security/Crypto/build.xml
index 16a8c62609..21fb095b10 100644
--- a/functional/security/Crypto/build.xml
+++ b/functional/security/Crypto/build.xml
@@ -54,7 +54,7 @@
 	
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
 	
-	<target name="dist" depends="getJtreg,getCryptoTest" description="generate the distribution">
+	<target name="dist" depends="getCryptoTest" description="generate the distribution">
 		<copy todir="${DEST}">
 			<fileset dir="${src}" includes="*.xml,*.mk" />
 		</copy>

From 19383d30cbade545e593432d5caec3942b618e7d Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Fri, 15 Mar 2024 10:21:45 +0100
Subject: [PATCH 4/4] Returned back to aqavit's jtregs withotu downloading
 custom one

Which will make
https://github.com/openjdk/jtreg/commit/8c105f2953edac0881819131f5f6836bda06ef25
missing again, but that - a tleast for jdk bigger then 8, should be eg
from https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtregtip.tar.gz
---
 functional/security/Crypto/build.xml    | 2 +-
 functional/security/Crypto/playlist.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/functional/security/Crypto/build.xml b/functional/security/Crypto/build.xml
index 21fb095b10..16a8c62609 100644
--- a/functional/security/Crypto/build.xml
+++ b/functional/security/Crypto/build.xml
@@ -54,7 +54,7 @@
 	
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
 	
-	<target name="dist" depends="getCryptoTest" description="generate the distribution">
+	<target name="dist" depends="getJtreg,getCryptoTest" description="generate the distribution">
 		<copy todir="${DEST}">
 			<fileset dir="${src}" includes="*.xml,*.mk" />
 		</copy>
diff --git a/functional/security/Crypto/playlist.xml b/functional/security/Crypto/playlist.xml
index 79c7a4d7d5..869f055450 100644
--- a/functional/security/Crypto/playlist.xml
+++ b/functional/security/Crypto/playlist.xml
@@ -32,6 +32,7 @@
 			</disable>
 		</disables>
 		<command>
+			JTREG_HOME="$(TEST_RESROOT)$(D)jtreg" \
 			SKIP_AGENT_TESTS=1 $(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
 		</command>
 		<features>