930 $$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \
931 $$(addprefix -vmoption:, $$(JTREG_VM_OPTIONS)) \
932 #
933
934 ifeq ($$($1_JTREG_ASSERT), true)
935 $1_JTREG_BASIC_OPTIONS += -ea -esa
936 endif
937
938 ifneq ($$($1_JTREG_NATIVEPATH), )
939 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
940 endif
941
942 ifneq ($$($1_JTREG_PROBLEM_LIST), )
943 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
944 endif
945
946 JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
947
948 JTREG_AUTO_PROBLEM_LISTS :=
949 # Please reach consensus before changing this. It was not easy changing it to a `1`.
950 JTREG_AUTO_TIMEOUT_FACTOR := 1
951
952 ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
953 JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
954 JTREG_AUTO_TIMEOUT_FACTOR := 10
955 endif
956
957 ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
958 JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
959 endif
960
961 ifneq ($$(findstring -XX:+UseShenandoahGC, $$(JTREG_ALL_OPTIONS)), )
962 JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
963 endif
964
965 ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
966 JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
967 endif
968
969
970 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
|
930 $$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \
931 $$(addprefix -vmoption:, $$(JTREG_VM_OPTIONS)) \
932 #
933
934 ifeq ($$($1_JTREG_ASSERT), true)
935 $1_JTREG_BASIC_OPTIONS += -ea -esa
936 endif
937
938 ifneq ($$($1_JTREG_NATIVEPATH), )
939 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
940 endif
941
942 ifneq ($$($1_JTREG_PROBLEM_LIST), )
943 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
944 endif
945
946 JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
947
948 JTREG_AUTO_PROBLEM_LISTS :=
949 # Please reach consensus before changing this. It was not easy changing it to a `1`.
950 JTREG_AUTO_TIMEOUT_FACTOR := 4
951
952 ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
953 JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
954 JTREG_AUTO_TIMEOUT_FACTOR := 10
955 endif
956
957 ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
958 JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
959 endif
960
961 ifneq ($$(findstring -XX:+UseShenandoahGC, $$(JTREG_ALL_OPTIONS)), )
962 JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
963 endif
964
965 ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
966 JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
967 endif
968
969
970 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
|