Skip to content

Commit f9f4fa9

Browse files
committed
Enable javax_net_ssl_fips with FIPS_VARIATION_PROBLEM_LIST_FILE
related: backlog/issues/1529 Signed-off-by: Lan Xia <[email protected]>
1 parent 277f44f commit f9f4fa9

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

openjdk/playlist.xml

+16-1
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,19 @@
12171217
<disable>
12181218
<comment>placeholder for now until the tests in javax/net/ssl are updated for FIPS</comment>
12191219
</disable>
1220+
<disable>
1221+
<comment>only applicable for Semeru atm</comment>
1222+
<vendor>eclipse</vendor>
1223+
</disable>
1224+
<disable>
1225+
<comment>Only applicable on aix, pliunx, xlinux, wins64 and zlinux atm</comment>
1226+
<platform>^((?!(ppc64_aix|ppc64le_linux|x86-64_linux|x86-64_windows|s390x_linux)).)*$</platform>
1227+
</disable>
12201228
</disables>
1229+
<variations>
1230+
<variation>-Dsemeru.fips=true -Dsemeru.customprofile=OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12 -Djava.security.properties=$(JTREG_JDK_TEST_DIR)/javax/net/ssl/TLSTest_java.security</variation>
1231+
<variation>-Dsemeru.fips=true -Dsemeru.customprofile=OpenJCEPlusFIPS.FIPS140-3-Test-TLS-JKS -Djava.security.properties=$(JTREG_JDK_TEST_DIR)/javax/net/ssl/TLSTest_java.security</variation>
1232+
</variations>
12211233
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
12221234
$(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q) $(JVM_OPTIONS) -Xmx512m $(VMOPTION_HEADLESS)$(Q) \
12231235
$(TIMEOUT_HANDLER) \
@@ -1227,6 +1239,7 @@
12271239
-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList.txt$(Q) \
12281240
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
12291241
${FEATURE_PROBLEM_LIST_FILE} \
1242+
${FIPS_VARIATION_PROBLEM_LIST_FILE} \
12301243
${VENDOR_PROBLEM_LIST_FILE} \
12311244
$(Q)$(JTREG_JDK_TEST_DIR)/javax/net/ssl/$(Q); \
12321245
$(TEST_STATUS)</command>
@@ -1237,7 +1250,9 @@
12371250
<group>openjdk</group>
12381251
</groups>
12391252
<features>
1240-
<feature>FIPS140_3_OpenJCEPlusFIPS:required</feature>
1253+
<feature>FIPS140_2:nonapplicable</feature>
1254+
<feature>FIPS140_3_OpenJCEPlusFIPS:nonapplicable</feature>
1255+
<feature>FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:nonapplicable</feature>
12411256
</features>
12421257
<impls>
12431258
<impl>ibm</impl>

0 commit comments

Comments
 (0)