diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2020-03-31 19:52:15 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2020-03-31 19:52:15 +0200 |
| commit | b3474802b81df6db83492adf251503d86b48299c (patch) | |
| tree | 0734667d9e88d922da43237be4a64c4bed980739 /examples | |
| parent | 1249981465e0a3f3786e647ead13b45a87a87b69 (diff) | |
| download | nettle-b3474802b81df6db83492adf251503d86b48299c.tar.gz | |
Rework setting of LD_LIBRARY_PATH for tests.test-shlib-dir
* testsuite/Makefile.in (check): Pass only TEST_SHLIB_DIR
to the run-tests script, and leave setting of LD_LIBRARY_PATH and
related variables to that script.
* examples/Makefile.in (check): Likewise.
* run-tests: Check TEST_SHLIB_DIR, and set up LD_LIBRARY_PATH and
related member variables.
* config.make.in (abs_top_builddir, TEST_SHLIB_DIR): New variables.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/Makefile.in b/examples/Makefile.in index db8e91cc..eb6a8179 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -113,9 +113,8 @@ 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" DYLD_LIBRARY_PATH=../.lib \ + TEST_SHLIB_DIR="$(TEST_SHLIB_DIR)" \ srcdir="$(srcdir)" EMULATOR="$(EMULATOR)" EXEEXT="$(EXEEXT)" \ "$(top_srcdir)"/run-tests $(TS_ALL) |