From 65fd284b5be7851e27c6061d4148171f121bb40e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niels=20M=C3=B6ller?= Date: Sun, 22 Oct 2017 09:47:48 +0200 Subject: [PATCH] Set DYLD_LIBRARY_PATH when running tests. --- examples/Makefile.in | 5 +++-- testsuite/Makefile.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/Makefile.in b/examples/Makefile.in index 8c93694b..43a06bc5 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -116,9 +116,10 @@ hogweed-benchmark$(EXEEXT): $(HOGWEED_BENCH_OBJS) $(TARGETS) : io.$(OBJEXT) ../libnettle.stamp $(HOGWEED_TARGETS): ../libhogweed.stamp +# The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX. check: $(TS_ALL) - LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ - EMULATOR="$(EMULATOR)" EXEEXT="$(EXEEXT)" \ + LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \ + srcdir="$(srcdir)" EMULATOR="$(EMULATOR)" EXEEXT="$(EXEEXT)" \ "$(top_srcdir)"/run-tests $(TS_ALL) Makefile: $(srcdir)/Makefile.in ../config.status diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 80233e83..3117d66d 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -131,9 +131,10 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ # data. VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes -# The PATH update is for locating dlls on w*ndows. +# The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX. check: $(TS_ALL) - LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ + LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \ + srcdir="$(srcdir)" \ EMULATOR="$(EMULATOR)" NM="$(NM)" EXEEXT="$(EXEEXT)" \ $(top_srcdir)/run-tests $(TS_ALL) -- 2.47.2