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