Skip to content

Commit

Permalink
moving JAVA_TO_TEST definition to TKG testEnv.mk (#5492)
Browse files Browse the repository at this point in the history
Co-authored-by: jandrlik <[email protected]>
  • Loading branch information
andrlos and jandrlik authored Sep 26, 2024
1 parent 60f23a3 commit 4a52723
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions jck/jck.mk
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

0 comments on commit 4a52723

Please sign in to comment.