File tree Expand file tree Collapse file tree 1 file changed +4
-0
lines changed
Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Original file line number Diff line number Diff line change @@ -78,6 +78,9 @@ $(eval $(call IncludeCustomExtension, RunTests.gmk))
7878
7979# This is the JDK that we will test
8080JDK_UNDER_TEST := $(JDK_IMAGE_DIR)
81+ # The JDK used to compile jtreg test code. By default it is the same as
82+ # JDK_UNDER_TEST.
83+ JDK_FOR_COMPILE := $(JDK_IMAGE_DIR)
8184
8285TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
8386TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
@@ -979,6 +982,7 @@ define SetupRunJtregTestBody
979982 $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
980983 -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
981984 $$($1_JTREG_BASIC_OPTIONS) \
985+ -compilejdk:$$(JDK_FOR_COMPILE) \
982986 -testjdk:$$(JDK_UNDER_TEST) \
983987 -dir:$$(JTREG_TOPDIR) \
984988 -reportDir:$$($1_TEST_RESULTS_DIR) \
You can’t perform that action at this time.
0 commit comments