stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189115: Pass JIB_DATA_DIR to jtreg harness

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Christian Tornqvist 2017-10-11 16:14:47 -04:00
parent f386e419c3
commit 269a6e79b5
2 changed files with 6 additions and 0 deletions

3
make/RunTests.gmk

@ -351,6 +351,9 @@ define SetupRunJtregTestBody
$1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet
# Make it possible to specify the JIB_DATA_DIR for tests using the
# JIB Artifact resolver
$1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
# Some tests needs to find a boot JDK using the JDK8_HOME variable.
$1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)

3
test/TestCommon.gmk

@ -360,6 +360,9 @@ ifeq ($(LIMIT_JTREG_VM_MEMORY), true)
JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m
JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION)
endif
# Make it possible to specify the JIB_DATA_DIR for tests using the
# JIB Artifact resolver
JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
# Give tests access to JT_JAVA, see JDK-8141609
JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
# Give aot tests access to Visual Studio installation