FIPS Test

Signed-off-by: Lan Xia <[email protected]>
llxia · Sep 24, 2024 · e4ec56b · e4ec56b
1 parent 277f44f
commit e4ec56b
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
@@ -1217,7 +1217,19 @@
  <disable>
  <comment>placeholder for now until the tests in javax/net/ssl are updated for FIPS</comment>
  </disable>
+ <disable>
+ <comment>only applicable for Semeru atm</comment>
+ <vendor>eclipse</vendor>
+ </disable>
+ <disable>
+ <comment>Only applicable on aix, pliunx, xlinux, wins64 and zlinux atm</comment>
+ <platform>^((?!(ppc64_aix|ppc64le_linux|x86-64_linux|x86-64_windows|s390x_linux)).)*$</platform>
+ </disable>
  </disables>
+ <variations>
+ <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>
+ <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>
+ </variations>
  <command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
  $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q) $(JVM_OPTIONS) -Xmx512m $(VMOPTION_HEADLESS)$(Q) \
  $(TIMEOUT_HANDLER) \
@@ -1227,6 +1239,7 @@
  -exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList.txt$(Q) \
  -exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
  ${FEATURE_PROBLEM_LIST_FILE} \
+ ${FIPS_VARIATION_PROBLEM_LIST_FILE} \
  ${VENDOR_PROBLEM_LIST_FILE} \
  $(Q)$(JTREG_JDK_TEST_DIR)/javax/net/ssl/$(Q); \
  $(TEST_STATUS)</command>
@@ -1236,9 +1249,6 @@
  <groups>
  <group>openjdk</group>
  </groups>
- <features>
- <feature>FIPS140_3_OpenJCEPlusFIPS:required</feature>
- </features>
  <impls>
  <impl>ibm</impl>
  <impl>openj9</impl>