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

Add logic to process platform specific exclude files #4486

Merged
merged 2 commits into from
May 10, 2023
Merged

Add logic to process platform specific exclude files #4486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30bac33
Add logic to process platform specific exclude files
Mesbah-Alam Mar 29, 2023
22dc519
Merge branch 'master' into add-plats-jtx
Mesbah-Alam May 10, 2023
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
20 changes: 19 additions & 1 deletion jck/jck.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,30 @@ ifndef APPLICATION_OPTIONS
APPLICATION_OPTIONS :=
endif

ifneq ($(filter openj9 ibm, $(JDK_IMPL)),)
# TODO: APPLICATION_OPTIONS being overridden.
APPLICATION_OPTIONS := customJtx=$(Q)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original APPLICATION_OPTIONS value will be ignored. If we will handle APPLICATION_OPTIONS in the future PR, please add a TODO comment here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added todo. Yes, will address this in a separate PR.

DEV_EXCLUDES_HOME=$(JCK_ROOT)/excludes/dev
ifneq (,$(wildcard $(DEV_EXCLUDES_HOME)/common.jtx))
APPLICATION_OPTIONS+=$(DEV_EXCLUDES_HOME)/common.jtx
endif
ifneq (,$(wildcard $(DEV_EXCLUDES_HOME)/$(SPEC).jtx))
APPLICATION_OPTIONS+=$(DEV_EXCLUDES_HOME)/$(SPEC).jtx
endif
ifneq (,$(findstring FIPS, $(TEST_FLAG)))
ifneq (,$(wildcard $(DEV_EXCLUDES_HOME)/fips.jtx))
APPLICATION_OPTIONS+=$(DEV_EXCLUDES_HOME)/fips.jtx
endif
endif
APPLICATION_OPTIONS+=$(Q)
endif

JAVA_TO_TEST = $(JAVA_COMMAND)
ifeq ($(USE_JRE),1)
JAVA_TO_TEST = $(JRE_COMMAND)
endif

JCK_CMD_TEMPLATE = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavaTestRunner resultsRoot=$(REPORTDIR) testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH) $(APPLICATION_OPTIONS)
JCK_CMD_TEMPLATE = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavaTestRunner resultsRoot=$(REPORTDIR) testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) spec=$(SPEC) configAltPath=$(CONFIG_ALT_PATH) $(APPLICATION_OPTIONS)
WORKSPACE=/home/jenkins/jckshare/workspace/output_$(UNIQUEID)/$@

ifneq ($(filter aix_ppc-64 zos_390 linux_ppc-64_le linux_390-64, $(SPEC)),)
Expand Down
Loading