Skip to content

Commit

Permalink
Remove jtreg duplicated crypto call (adoptium#5134)
Browse files Browse the repository at this point in the history
* 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
openjdk/jtreg@8c105f2
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
  • Loading branch information
judovana authored and sophiaxu0424 committed Mar 19, 2024
1 parent 1ce23a4 commit e7b0f58
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions functional/security/Crypto/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit e7b0f58

Please sign in to comment.