From e7b0f5838a6ebca4f73b20dfa7437d0f9ff7db18 Mon Sep 17 00:00:00 2001
From: judovana <jvanek@redhat.com>
Date: Fri, 15 Mar 2024 22:54:29 +0100
Subject: [PATCH] Remove jtreg duplicated crypto call (#5134)

* Removed jtreg call by the upstream wrapper

which is doing moreover the same

* moved out of the tmpresults

* Removed build's download of jtreg as suite pulls its own

* 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/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..869f055450 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>
+			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>
 			<feature>FIPS140_2:nonapplicable</feature>
 		</features>