equal
deleted
inserted
replaced
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) "$(patsubst %\,%,$(VS120COMNTOOLS))")" |
449 JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS="$(shell $(GETMIXEDPATH) "$(patsubst %\,%,$(VS120COMNTOOLS))")" |
450 endif |
450 endif |
|
451 |
|
452 JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=${TEST_IMAGE_DIR}/hotspot/jtreg/graal |
|
453 |
451 # Set other vm and test options |
454 # Set other vm and test options |
452 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
455 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
453 ifneq ($(JIB_JAR), ) |
456 ifneq ($(JIB_JAR), ) |
454 JTREG_BASIC_OPTIONS += -cpa:$(shell $(GETMIXEDPATH) "$(JIB_JAR)") |
457 JTREG_BASIC_OPTIONS += -cpa:$(shell $(GETMIXEDPATH) "$(JIB_JAR)") |
455 endif |
458 endif |