diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml index a1bf6c68b3..6cf741070b 100644 --- a/functional/OpenJcePlusTests/playlist.xml +++ b/functional/OpenJcePlusTests/playlist.xml @@ -42,10 +42,11 @@ mkdir junitreports; \ cp -r ${REPORTDIR}/target/surefire-reports/* junitreports - - FIPS140_3_OpenJCEPlusFIPS:required - FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:required - + + FIPS140_2:nonapplicable + FIPS140_3_OpenJCEPlusFIPS:nonapplicable + FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:nonapplicable + extended diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml index bc4ea7c927..15ef341b56 100644 --- a/openjdk/playlist.xml +++ b/openjdk/playlist.xml @@ -1657,6 +1657,35 @@ FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:nonapplicable + + jdk_restricted_security_j9 + + Only applicable on aix, pliunx, xlinux, wins64 and zlinux atm + ^((?!(ppc64_aix|ppc64le_linux|x86-64_linux|x86-64_windows|s390x_linux)).)*$ + + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ + $(TIMEOUT_HANDLER) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ + -r $(Q)$(REPORTDIR)$(D)report$(Q) \ + -jdk:$(Q)$(TEST_JDK_HOME)$(Q) \ + $(Q)$(OPENJDK_DIR)$(D)closed$(D)test$(D)jdk$(D)openj9$(D)internal$(D)security$(Q); \ + $(TEST_STATUS) + + FIPS140_3_OpenJCEPlusFIPS:required + FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:required + + + special + + + openjdk + + + openj9 + ibm + + jdk_rmi