814 #
815
816 ifeq ($$($1_JTREG_ASSERT), true)
817 $1_JTREG_BASIC_OPTIONS += -ea -esa
818 endif
819
820 ifneq ($$($1_JTREG_NATIVEPATH), )
821 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
822 endif
823
824 ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
825 JTREG_PROBLEM_LIST_PREFIX := -match:
826 else
827 JTREG_PROBLEM_LIST_PREFIX := -exclude:
828 endif
829
830 ifneq ($$($1_JTREG_PROBLEM_LIST), )
831 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
832 endif
833
834 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
835 # Accept both absolute paths as well as relative to the current test root.
836 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
837 $$(JTREG_EXTRA_PROBLEM_LISTS) \
838 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
839 ))
840 endif
841
842 ifneq ($$(JIB_HOME), )
843 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
844 endif
845
846 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
847
848 ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
849 $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
850 endif
851
852 ifneq ($$(JTREG_KEYWORDS), )
853 # The keywords string may contain problematic characters and may be quoted
|
814 #
815
816 ifeq ($$($1_JTREG_ASSERT), true)
817 $1_JTREG_BASIC_OPTIONS += -ea -esa
818 endif
819
820 ifneq ($$($1_JTREG_NATIVEPATH), )
821 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
822 endif
823
824 ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
825 JTREG_PROBLEM_LIST_PREFIX := -match:
826 else
827 JTREG_PROBLEM_LIST_PREFIX := -exclude:
828 endif
829
830 ifneq ($$($1_JTREG_PROBLEM_LIST), )
831 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
832 endif
833
834 # Add more Lilliput-specific ProblemLists when UCOH is enabled
835 ifneq ($$(findstring -XX:+UseCompactObjectHeaders, $$(TEST_OPTS)), )
836 JTREG_EXTRA_PROBLEM_LISTS += $(TOPDIR)/test/hotspot/jtreg/ProblemList-lilliput.txt
837 endif
838
839 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
840 # Accept both absolute paths as well as relative to the current test root.
841 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
842 $$(JTREG_EXTRA_PROBLEM_LISTS) \
843 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
844 ))
845 endif
846
847 ifneq ($$(JIB_HOME), )
848 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
849 endif
850
851 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
852
853 ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
854 $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
855 endif
856
857 ifneq ($$(JTREG_KEYWORDS), )
858 # The keywords string may contain problematic characters and may be quoted
|