equal
deleted
inserted
replaced
358 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
358 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
359 # Set the max memory for jtreg target test vms |
359 # Set the max memory for jtreg target test vms |
360 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m |
360 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m |
361 JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
361 JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
362 endif |
362 endif |
|
363 # Make it possible to specify the JIB_DATA_DIR for tests using the |
|
364 # JIB Artifact resolver |
|
365 JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR |
363 # Give tests access to JT_JAVA, see JDK-8141609 |
366 # Give tests access to JT_JAVA, see JDK-8141609 |
364 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
367 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
365 # Give aot tests access to Visual Studio installation |
368 # Give aot tests access to Visual Studio installation |
366 ifneq ($(VS120COMNTOOLS), ) |
369 ifneq ($(VS120COMNTOOLS), ) |
367 JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)") |
370 JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)") |