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