Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add DYLD_LIBRARY_PATH for osx native testing #3765

Merged
merged 1 commit into from
Nov 26, 2018
Merged

add DYLD_LIBRARY_PATH for osx native testing #3765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/TestConfig/openj9Settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ else
TEST_LIB_PATH:=LIBPATH=$(Q)$(LIBPATH)$(PS)$(TEST_LIB_PATH_VALUE)$(Q)
else ifneq (,$(findstring zos,$(SPEC)))
TEST_LIB_PATH:=LIBPATH=$(Q)$(LIBPATH)$(PS)$(TEST_LIB_PATH_VALUE)$(Q)
else ifneq (,$(findstring osx,$(SPEC)))
TEST_LIB_PATH:=DYLD_LIBRARY_PATH=$(TEST_LIB_PATH_VALUE)$(PS)$(DYLD_LIBRARY_PATH)
else
TEST_LIB_PATH:=LD_LIBRARY_PATH=$(Q)$(TEST_LIB_PATH_VALUE)$(PS)$(LD_LIBRARY_PATH)$(Q)
endif
Expand Down
3 changes: 2 additions & 1 deletion test/functional/cmdLineTests/gptest/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
-Xint -jar $(CMDLINETESTER_JAR) \
-config $(Q)$(TEST_RESROOT)$(D)gptests.xml$(Q) -verbose -explainExcludes -xids all,$(PLATFORM),$(VARIATION) -plats all,$(PLATFORM),$(VARIATION) -xlist $(Q)$(TEST_RESROOT)$(D)cmdlineopttest_exclude.xml$(Q) -nonZeroExitWhenError; \
${TEST_STATUS} </command>
<platformRequirements>^os.win</platformRequirements>
<!-- temporarily disable this test on osx; https://github.com/eclipse/openj9/issues/3686 -->
<platformRequirements>^os.win,^os.osx</platformRequirements>
<levels>
<level>sanity</level>
</levels>
Expand Down
3 changes: 2 additions & 1 deletion test/functional/cmdLineTests/pltest/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
-xids all,$(PLATFORM),$(VARIATION) -plats all,$(PLATFORM),$(VARIATION) -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
<!-- temporarily disable this test on windows; https://github.com/eclipse/openj9/issues/3212 -->
<platformRequirements>^os.aix,^os.win</platformRequirements>
<!-- temporarily disable this test on osx; https://github.com/eclipse/openj9/issues/3685 -->
<platformRequirements>^os.aix,^os.win,^os.osx</platformRequirements>
<levels>
<level>sanity</level>
</levels>
Expand Down