equal
deleted
inserted
replaced
444 JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR |
444 JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR |
445 # Give tests access to JT_JAVA, see JDK-8141609 |
445 # Give tests access to JT_JAVA, see JDK-8141609 |
446 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
446 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
447 # Give aot tests access to Visual Studio installation |
447 # Give aot tests access to Visual Studio installation |
448 ifneq ($(VS120COMNTOOLS), ) |
448 ifneq ($(VS120COMNTOOLS), ) |
449 JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)") |
449 JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS="$(shell $(GETMIXEDPATH) "$(patsubst %\,%,$(VS120COMNTOOLS))")" |
450 endif |
450 endif |
451 # Set other vm and test options |
451 # Set other vm and test options |
452 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
452 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
453 ifneq ($(JIB_JAR), ) |
453 ifneq ($(JIB_JAR), ) |
454 JTREG_BASIC_OPTIONS += -cpa:$(shell $(GETMIXEDPATH) "$(JIB_JAR)") |
454 JTREG_BASIC_OPTIONS += -cpa:$(shell $(GETMIXEDPATH) "$(JIB_JAR)") |