955 # Please reach consensus before changing this.
956 JTREG_AUTO_TIMEOUT_FACTOR := 4
957
958 ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
959 JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
960 JTREG_AUTO_TIMEOUT_FACTOR := 10
961 endif
962
963 ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
964 JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
965 endif
966
967 ifneq ($$(findstring -XX:+UseShenandoahGC, $$(JTREG_ALL_OPTIONS)), )
968 JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
969 endif
970
971 ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
972 JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
973 endif
974
975 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
976 # Accept both absolute paths as well as relative to the current test root.
977 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
978 $$(JTREG_EXTRA_PROBLEM_LISTS) \
979 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
980 ))
981 endif
982
983 ifneq ($$(JIB_HOME), )
984 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
985 endif
986
987 ifneq ($$(JDK_FOR_COMPILE), )
988 # Allow overriding the JDK used for compilation from the command line
989 $1_JTREG_BASIC_OPTIONS += -compilejdk:$$(JDK_FOR_COMPILE)
990 endif
991
992 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
993
994 $1_JTREG_BASIC_OPTIONS += -e:DOCS_JDK_IMAGE_DIR=$$(DOCS_JDK_IMAGE_DIR)
|
955 # Please reach consensus before changing this.
956 JTREG_AUTO_TIMEOUT_FACTOR := 4
957
958 ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
959 JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
960 JTREG_AUTO_TIMEOUT_FACTOR := 10
961 endif
962
963 ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
964 JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
965 endif
966
967 ifneq ($$(findstring -XX:+UseShenandoahGC, $$(JTREG_ALL_OPTIONS)), )
968 JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
969 endif
970
971 ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
972 JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
973 endif
974
975 ifneq ($$(findstring -XX:+UseCompactObjectHeaders, $$(JTREG_ALL_OPTIONS)), )
976 JTREG_AUTO_PROBLEM_LISTS += ProblemList-coh.txt
977 endif
978
979
980 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
981 # Accept both absolute paths as well as relative to the current test root.
982 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
983 $$(JTREG_EXTRA_PROBLEM_LISTS) \
984 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
985 ))
986 endif
987
988 ifneq ($$(JIB_HOME), )
989 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
990 endif
991
992 ifneq ($$(JDK_FOR_COMPILE), )
993 # Allow overriding the JDK used for compilation from the command line
994 $1_JTREG_BASIC_OPTIONS += -compilejdk:$$(JDK_FOR_COMPILE)
995 endif
996
997 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
998
999 $1_JTREG_BASIC_OPTIONS += -e:DOCS_JDK_IMAGE_DIR=$$(DOCS_JDK_IMAGE_DIR)
|