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