From 269a6e79b5abae0d322bd23b86ce4a4688f7bdd2 Mon Sep 17 00:00:00 2001
From: Christian Tornqvist <ctornqvi@openjdk.org>
Date: Wed, 11 Oct 2017 16:14:47 -0400
Subject: [PATCH] 8189115: Pass JIB_DATA_DIR to jtreg harness

Reviewed-by: erikj
---
 make/RunTests.gmk   | 3 +++
 test/TestCommon.gmk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index d813138f280..6305a00c10b 100644
--- a/make/RunTests.gmk
+++ b/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)
 
diff --git a/test/TestCommon.gmk b/test/TestCommon.gmk
index ea92e8e5128..12c9372991a 100644
--- a/test/TestCommon.gmk
+++ b/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