Skip to content

Commit

Permalink
8348905: Add support to specify the JDK for compiling Jtreg tests
Browse files Browse the repository at this point in the history
Reviewed-by: erikj
  • Loading branch information
jianglizhou committed Jan 29, 2025
1 parent 6b581d2 commit cbe9ec5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions make/RunTests.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ $(eval $(call IncludeCustomExtension, RunTests.gmk))

# This is the JDK that we will test
JDK_UNDER_TEST := $(JDK_IMAGE_DIR)
# The JDK used to compile jtreg test code. By default it is the same as
# JDK_UNDER_TEST.
JDK_FOR_COMPILE := $(JDK_IMAGE_DIR)

TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
Expand Down Expand Up @@ -979,6 +982,7 @@ define SetupRunJtregTestBody
$$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
-Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
$$($1_JTREG_BASIC_OPTIONS) \
-compilejdk:$$(JDK_FOR_COMPILE) \
-testjdk:$$(JDK_UNDER_TEST) \
-dir:$$(JTREG_TOPDIR) \
-reportDir:$$($1_TEST_RESULTS_DIR) \
Expand Down

0 comments on commit cbe9ec5

Please sign in to comment.