Skip to content

Using jtreg.jar as declared in TKG #6125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
judovana wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Using jtreg.jar as declared in TKG #6125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cd9898
Using jtreg.jar as declared in TKG
judovana Apr 1, 2025
081515b
Adjsuted to JTREG_HOME in /TKG/issues/690
judovana Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions functional/security/Crypto/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
</disable>
</disables>
<command>
export JTREG_HOME="$(TEST_RESROOT)$(D)jtreg" ; \
export JTREG_HOME=$(Q)$(JTREG_HOME)$(Q) ; \
if [ "x${SKIP_AGENT_TESTS}" = "x" ] ; then export SKIP_AGENT_TESTS=1 ; fi ; \
$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh $(Q)$(TEST_JDK_HOME)$(Q) ; $(TEST_STATUS)
</command>
<features>
<feature>FIPS140_2:nonapplicable</feature>
Expand Down Expand Up @@ -78,7 +78,7 @@
<platform>.*solaris</platform>
</disable>
</disables>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(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) \
Expand Down
4 changes: 2 additions & 2 deletions functional/security/ssl-tests/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</disable>
</disables>
<command>
JTREG_HOME="$(TEST_RESROOT)$(D)jtreg" \
$(TEST_ROOT)$(D)functional$(D)security$(D)ssl-tests$(D)ssl-tests$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
JTREG_HOME=$(Q)$(JTREG_HOME)$(Q) \
$(TEST_ROOT)$(D)functional$(D)security$(D)ssl-tests$(D)ssl-tests$(D)run.sh $(Q)$(TEST_JDK_HOME)$(Q) ; $(TEST_STATUS)
</command>
<levels>
<level>dev</level>
Expand Down
4 changes: 2 additions & 2 deletions get.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ CLONE_OPENJ9="true"
OPENJ9_REPO="https://github.com/eclipse-openj9/openj9.git"
OPENJ9_SHA=""
OPENJ9_BRANCH=""
TKG_REPO="https://github.com/adoptium/TKG.git"
TKG_BRANCH="master"
TKG_REPO="https://github.com/judovana/TKG.git"
TKG_BRANCH="setupAbleJtreg"
Copy link
Contributor Author

@judovana judovana Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is of course temporary

VENDOR_REPOS=""
VENDOR_SHAS=""
VENDOR_BRANCHES=""
Expand Down
Loading