Skip to content

Commit 8d956ca

Browse files
committed
Add CryptoTests_jtreg
- add CryptoTests_jtreg back (based on the original change https://github.com/adoptium/aqa-tests/pull/5134/files) - CryptoTests_jtreg directly triggers the tests via jtreg and it runs against all vendors except redhat - CryptoTests only runs for vendor=redhat - re-enable CryptoTests_jtreg on aarch64_mac|x86-64_mac|s390x_linux (related to run.sh issue. See CryptoTests readlink: illegal option -- f eclipse-openj9/openj9#19164) - add retry for git clone to mitigate network issue - add check CryptoTest repo sha (sha will be captured in TAP file) Signed-off-by: Lan Xia <[email protected]>
1 parent 3ae4045 commit 8d956ca

File tree

2 files changed

+44
-4
lines changed

2 files changed

+44
-4
lines changed

functional/security/Crypto/build.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@
4242
</else>
4343
</if>
4444
<target name="getCryptoTest" depends="cryptoTest.check" unless="cryptoTestdir.exists">
45-
<exec executable="git" failonerror="true">
46-
<arg value="clone" />
47-
<arg value="${GIT_REPO}rh-openjdk/CryptoTest.git" />
48-
</exec>
45+
<getFileWithRetry file="CryptoTest" command="git clone --depth 1 -q ${GIT_REPO}rh-openjdk/CryptoTest.git -b master CryptoTest"/>
46+
<checkGitRepoSha repoDir="CryptoTest"/>
4947
</target>
5048

5149
<target name="init">

functional/security/Crypto/playlist.xml

+42
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,47 @@
4949
<groups>
5050
<group>functional</group>
5151
</groups>
52+
<vendors>
53+
<vendor>redhat</vendor>
54+
</vendors>
55+
</test>
56+
<test>
57+
<testCaseName>CryptoTests_jtreg</testCaseName>
58+
<disables>
59+
<disable>
60+
<comment>for redhat, please see CryptoTests</comment>
61+
<vendor>redhat</vendor>
62+
</disable>
63+
<disable>
64+
<comment>https://github.com/eclipse-openj9/openj9/issues/16712</comment>
65+
<version>19+</version>
66+
<impl>openj9</impl>
67+
</disable>
68+
<disable>
69+
<comment>https://github.com/eclipse-openj9/openj9/issues/16710</comment>
70+
<platform>.*windows</platform>
71+
<impl>openj9</impl>
72+
</disable>
73+
<disable>
74+
<comment>https://github.com/adoptium/aqa-tests/issues/4336</comment>
75+
<platform>.*solaris</platform>
76+
</disable>
77+
</disables>
78+
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
79+
-a -xml -v:fail,error,time,nopass,summary -Dcryptotests.skipAgentTests=1 -timeoutFactor:2 \
80+
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
81+
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
82+
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
83+
$(Q)$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(Q); \
84+
$(TEST_STATUS)</command>
85+
<features>
86+
<feature>FIPS140_2:nonapplicable</feature>
87+
</features>
88+
<levels>
89+
<level>extended</level>
90+
</levels>
91+
<groups>
92+
<group>functional</group>
93+
</groups>
5294
</test>
5395
</playlist>

0 commit comments

Comments
 (0)