Skip to content

Commit

Permalink
Enable OpenJcePlusTests for FIPS140-3 (#5638)
Browse files Browse the repository at this point in the history
- Enable if the check for TEST_FLAG contains FIPS140_3_OpenJCEPlusFIPS.
- Added feature tags into playlist as required feature.
- Required feature Option cannot be used with other feature options

related:https://github.ibm.com/runtimes/backlog/issues/1525

Signed-off-by: Anna Babu Palathingal <[email protected]>
  • Loading branch information
annaibm authored Sep 30, 2024
1 parent bdbac9b commit bd69eb5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
34 changes: 16 additions & 18 deletions functional/OpenJcePlusTests/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,29 +120,27 @@
<delete dir="${build}" />
</target>

<target name="build" >
<target name="build">
<if>
<or>
<and>
<contains string="${TEST_FLAG}" substring="FIPS140_3_OpenJCEPlusFIPS"/>
<and>
<equals arg1="${JDK_VENDOR}" arg2="ibm" />
<equals arg1="${JDK_IMPL}" arg2="openj9" />
<not>
<matches string="${JDK_VERSION}" pattern="^(8)$$" />
</not>
<or>
<contains string="${SPEC}" substring="aix_ppc-64"/>
<contains string="${SPEC}" substring="linux_ppc-64_le"/>
<contains string="${SPEC}" substring="linux_x86-64"/>
<contains string="${SPEC}" substring="win_x86-64"/>
<contains string="${SPEC}" substring="linux_390-64"/>
</or>
</and>
</or>
<equals arg1="${JDK_VENDOR}" arg2="ibm" />
<equals arg1="${JDK_IMPL}" arg2="openj9" />
<not>
<matches string="${JDK_VERSION}" pattern="^(8)$" />
</not>
<or>
<contains string="${SPEC}" substring="aix_ppc-64"/>
<contains string="${SPEC}" substring="linux_ppc-64_le"/>
<contains string="${SPEC}" substring="linux_x86-64"/>
<contains string="${SPEC}" substring="win_x86-64"/>
<contains string="${SPEC}" substring="linux_390-64"/>
</or>
</and>
<then>
<antcall target="clean" inheritall="true" />
</then>
</if>

</target>

</project>
3 changes: 2 additions & 1 deletion functional/OpenJcePlusTests/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
cp -r ${REPORTDIR}/target/surefire-reports/* junitreports
</command>
<features>
<feature>FIPS140_2:nonapplicable</feature>
<feature>FIPS140_3_OpenJCEPlusFIPS:required</feature>
<feature>FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:required</feature>
</features>
<levels>
<level>extended</level>
Expand Down

0 comments on commit bd69eb5

Please sign in to comment.