stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2023-10-23 11:26:39 +00:00
parent 704c6ea16c
commit 99de9bb83f
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/RunTestsPrebuilt.gmk
View File

@ -122,7 +122,7 @@ $(eval $(call SetupVariable,JT_HOME))
$(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk)) $(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
$(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test)) $(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
$(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK)) $(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK))
$(eval $(call SetupVariable,JTREG_JAVA,$(BOOT_JDK)/bin/java)) $(eval $(call SetupVariable,JTREG_JDK,$(BOOT_JDK)))
# Provide default values for tools that we need # Provide default values for tools that we need
$(eval $(call SetupVariable,MAKE,make,NO_CHECK)) $(eval $(call SetupVariable,MAKE,make,NO_CHECK))
@ -249,7 +249,7 @@ $(call CreateNewSpec, $(NEW_SPEC), \
TOPDIR := $(TOPDIR), \ TOPDIR := $(TOPDIR), \
OUTPUTDIR := $(OUTPUTDIR), \ OUTPUTDIR := $(OUTPUTDIR), \
BOOT_JDK := $(BOOT_JDK), \ BOOT_JDK := $(BOOT_JDK), \
JTREG_JAVA := $(FIXPATH) $(JTREG_JAVA), \ JTREG_JDK := $(JTREG_JDK), \
JT_HOME := $(JT_HOME), \ JT_HOME := $(JT_HOME), \
JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \ JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \ JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \

2
make/RunTestsPrebuiltSpec.gmk
View File

@ -124,6 +124,8 @@ JAR := $(FIXPATH) $(JAR_CMD)
JLINK := $(FIXPATH) $(JLINK_CMD) JLINK := $(FIXPATH) $(JLINK_CMD)
JMOD := $(FIXPATH) $(JMOD_CMD) JMOD := $(FIXPATH) $(JMOD_CMD)
JTREG_JAVA := $(FIXPATH) $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
################################################################################ ################################################################################
# Some common tools. Assume most common name and no path. # Some common tools. Assume most common name and no path.

9
make/autoconf/lib-tests.m4
View File

@ -251,11 +251,10 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
AC_MSG_RESULT([no, using BOOT_JDK]) AC_MSG_RESULT([no, using BOOT_JDK])
fi fi
JTREG_JAVA="$JTREG_JDK/bin/java" UTIL_FIXUP_PATH(JTREG_JDK)
UTIL_FIXUP_PATH(JTREG_JAVA) AC_SUBST([JTREG_JDK])
JTREG_JAVA="$FIXPATH $JTREG_JAVA" # For use in the configure script
AC_SUBST([JTREG_JAVA]) JTREG_JAVA="$FIXPATH $JTREG_JDK/bin/java"
# Verify jtreg version # Verify jtreg version
if test "x$JT_HOME" != x; then if test "x$JT_HOME" != x; then

5
make/autoconf/spec.gmk.in
View File

@ -666,8 +666,6 @@ JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
BUILDJDK_JAVA_FLAGS_SMALL:=@BUILDJDK_JAVA_FLAGS_SMALL@ BUILDJDK_JAVA_FLAGS_SMALL:=@BUILDJDK_JAVA_FLAGS_SMALL@
JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@ JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
JTREG_JAVA:=@JTREG_JAVA@
# The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk # The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk
# for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD # for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD
# versions of the variables directly. # versions of the variables directly.
@ -687,6 +685,9 @@ JAR = $(JAR_CMD)
JLINK = $(JLINK_CMD) JLINK = $(JLINK_CMD)
JMOD = $(JMOD_CMD) JMOD = $(JMOD_CMD)
JTREG_JDK := @JTREG_JDK@
JTREG_JAVA = @FIXPATH@ $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS) BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac