Skip to content

Issue 5428: Allow JRE testing for other testsuite aside from JCK #5492

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

Merged
karianna merged 1 commit into from
Sep 26, 2024
Merged

Issue 5428: Allow JRE testing for other testsuite aside from JCK #5492

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
7 changes: 1 addition & 6 deletions jck/jck.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ ifneq ($(filter openj9 ibm, $(JDK_IMPL)),)
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 JavatestUtil workdir=$(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)/$@

Expand Down Expand Up @@ -175,4 +170,4 @@ ifeq ($(JDK_VERSION), 11)
EXEC_RUNTIME_TEST_WITH_RMI_SERVICES = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(START_RMIREG)' '$(START_RMID)' '$(EXEC_RUNTIME_TEST)'
endif

include $(TEST_ROOT)/jck/subdirs/jck$(JDK_VERSION).mk
include $(TEST_ROOT)/jck/subdirs/jck$(JDK_VERSION).mk