Skip to content
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.

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

Add CryptoTests_jtreg #5240

Merged
merged 1 commit into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 4 deletions functional/security/Crypto/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@
</else>
</if>
<target name="getCryptoTest" depends="cryptoTest.check" unless="cryptoTestdir.exists">
<exec executable="git" failonerror="true">
<arg value="clone" />
<arg value="${GIT_REPO}rh-openjdk/CryptoTest.git" />
</exec>
<getFileWithRetry file="CryptoTest" command="git clone --depth 1 -q ${GIT_REPO}rh-openjdk/CryptoTest.git -b master CryptoTest"/>
<checkGitRepoSha repoDir="CryptoTest"/>
</target>

<target name="init">
Expand Down
42 changes: 42 additions & 0 deletions functional/security/Crypto/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,47 @@
<groups>
<group>functional</group>
</groups>
<vendors>
<vendor>redhat</vendor>
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this be make opposite? To enable this main for all, except the few broken, and enable CryptoTests_jtreg only for the zOs or whereevere the main rnner do not fit?

Copy link
Contributor

Choose a reason for hiding this comment

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

Can this be make opposite? To enable this main for all, except the few broken, and enable CryptoTests_jtreg only for the zOs or whereevere the main rnner do not fit?

If this PR would have not moved the default exclusion in favour of itself it would be awesome temporary workaround for affected platforms before the real issue s fixed.

</vendors>
</test>
<test>
<testCaseName>CryptoTests_jtreg</testCaseName>
<disables>
<disable>
<comment>for redhat, please see CryptoTests</comment>
<vendor>redhat</vendor>
</disable>
<disable>
<comment>https://github.com/eclipse-openj9/openj9/issues/16712</comment>
<version>19+</version>
<impl>openj9</impl>
</disable>
<disable>
<comment>https://github.com/eclipse-openj9/openj9/issues/16710</comment>
<platform>.*windows</platform>
<impl>openj9</impl>
</disable>
<disable>
<comment>https://github.com/adoptium/aqa-tests/issues/4336</comment>
<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>
<features>
<feature>FIPS140_2:nonapplicable</feature>
</features>
<levels>
<level>extended</level>
</levels>
<groups>
<group>functional</group>
</groups>
</test>
</playlist>