795 #
796
797 ifeq ($$($1_JTREG_ASSERT), true)
798 $1_JTREG_BASIC_OPTIONS += -ea -esa
799 endif
800
801 ifneq ($$($1_JTREG_NATIVEPATH), )
802 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
803 endif
804
805 ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
806 JTREG_PROBLEM_LIST_PREFIX := -match:
807 else
808 JTREG_PROBLEM_LIST_PREFIX := -exclude:
809 endif
810
811 ifneq ($$($1_JTREG_PROBLEM_LIST), )
812 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
813 endif
814
815 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
816 # Accept both absolute paths as well as relative to the current test root.
817 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
818 $$(JTREG_EXTRA_PROBLEM_LISTS) \
819 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
820 ))
821 endif
822
823 ifneq ($$(JIB_HOME), )
824 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
825 endif
826
827 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
828
829 ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
830 $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
831 endif
832
833 ifneq ($$(JTREG_KEYWORDS), )
834 # The keywords string may contain problematic characters and may be quoted
|
795 #
796
797 ifeq ($$($1_JTREG_ASSERT), true)
798 $1_JTREG_BASIC_OPTIONS += -ea -esa
799 endif
800
801 ifneq ($$($1_JTREG_NATIVEPATH), )
802 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
803 endif
804
805 ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
806 JTREG_PROBLEM_LIST_PREFIX := -match:
807 else
808 JTREG_PROBLEM_LIST_PREFIX := -exclude:
809 endif
810
811 ifneq ($$($1_JTREG_PROBLEM_LIST), )
812 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
813 endif
814
815 # Add more Lilliput-specific ProblemLists when UCOH is enabled
816 ifneq ($$(findstring -XX:+UseCompactObjectHeaders, $$(TEST_OPTS)), )
817 JTREG_EXTRA_PROBLEM_LISTS += $(TOPDIR)/test/hotspot/jtreg/ProblemList-lilliput.txt
818 endif
819
820 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
821 # Accept both absolute paths as well as relative to the current test root.
822 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
823 $$(JTREG_EXTRA_PROBLEM_LISTS) \
824 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
825 ))
826 endif
827
828 ifneq ($$(JIB_HOME), )
829 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
830 endif
831
832 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
833
834 ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
835 $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
836 endif
837
838 ifneq ($$(JTREG_KEYWORDS), )
839 # The keywords string may contain problematic characters and may be quoted
|