]> git.ipfire.org Git - thirdparty/nettle.git/commitdiff
Set DYLD_LIBRARY_PATH when running tests.
authorNiels Möller <nisse@lysator.liu.se>
Sun, 22 Oct 2017 07:47:48 +0000 (09:47 +0200)
committerNiels Möller <nisse@lysator.liu.se>
Sun, 22 Oct 2017 07:47:48 +0000 (09:47 +0200)
examples/Makefile.in
testsuite/Makefile.in

index 8c93694b4faffdc21982ff85467ab20633ee38f8..43a06bc5fbf4a6c2821a1b48391be17ccb894874 100644 (file)
@@ -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
index 80233e83fc200a3f1067187eff72869313fdefbd..3117d66def795717733a775482c9c6642418be2d 100644 (file)
@@ -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)