Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(j9.0.42-release) Add support for FIPS multi-version openjdk exclude (#4905) #4919

Merged
merged 1 commit into from
Dec 12, 2023
Merged

(j9.0.42-release) Add support for FIPS multi-version openjdk exclude (#4905) #4919

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions openjdk/openjdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,10 @@ ifneq ($(filter 11 16, $(JDK_VERSION)),)
endif

FEATURE_PROBLEM_LIST_FILE:=
ifneq (,$(findstring FIPS, $(TEST_FLAG)))
FEATURE_PROBLEM_LIST_FILE:=-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList-fips.txt$(Q)
ifneq (,$(findstring FIPS140_2, $(TEST_FLAG)))
FEATURE_PROBLEM_LIST_FILE:=-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList-FIPS140_2.txt$(Q)
else ifneq (,$(findstring FIPS140_3_OpenJcePlus, $(TEST_FLAG)))
FEATURE_PROBLEM_LIST_FILE:=-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList-FIPS140_3_OpenJcePlus.txt$(Q)
endif

VENDOR_PROBLEM_LIST_FILE:=
Expand Down