Skip to content

Commit 4040182

Browse files
committed
Export LIBPATH
Signed-off-by: Darshan N <[email protected]>
1 parent ecde6b0 commit 4040182

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

openjdk/openjdk.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ ifneq ($(JDK_VERSION),8)
189189
# else if JDK_IMPL is openj9 or ibm
190190
else ifneq ($(filter openj9 ibm, $(JDK_IMPL)),)
191191
JVM_NATIVE_OPTIONS := -nativepath:"$(TESTIMAGE_PATH)$(D)openj9"
192+
ifeq ($(OS),OS/390)
193+
ZOS_NATIVE_LIBPATH := -e LIBPATH=$(TESTIMAGE_PATH)$(D)hotspot$(D)jtreg$(D)native
194+
endif
192195
endif
193196
endif
194197
endif

openjdk/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
<variation>Mode1000</variation>
607607
</variations>
608608
<command>$(JAVA_COMMAND) -Xmx512m $(APPLICATION_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
609-
$(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
609+
$(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" ${ZOS_NATIVE_LIBPATH} -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
610610
$(TIMEOUT_HANDLER) \
611611
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
612612
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \

0 commit comments

Comments
 (0)