diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | mini-gmp/ChangeLog | 3 | ||||
| -rwxr-xr-x | mini-gmp/tests/run-tests | 10 |
4 files changed, 17 insertions, 3 deletions
@@ -1,7 +1,9 @@ 2016-11-19 Niels Möller <nisse@lysator.liu.se> * Makefile.am (check-mini-gmp): Override CFLAGS and CPPFLAGS - instead of the deleted EXTRA_CFLAGS. + instead of the deleted EXTRA_CFLAGS. Set TEST_LIBRARY_PATH, + instead of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH, to avoid getting + gcc linked with an unexpected version of gmp. 2016-11-18 Niels Möller <nisse@lysator.liu.se> diff --git a/Makefile.am b/Makefile.am index e89e866fe..33fd20643 100644 --- a/Makefile.am +++ b/Makefile.am @@ -427,8 +427,7 @@ check-mini-gmp: abs_srcdir="`cd $(srcdir) && pwd`" ; \ $(MKDIR_P) mini-gmp/tests \ && cd mini-gmp/tests \ - && LD_LIBRARY_PATH="../../.libs:$$LD_LIBRARY_PATH" \ - DYLD_LIBRARY_PATH="../../.libs:$$DYLD_LIBRARY_PATH" \ + && TEST_LIBRARY_PATH="../../.libs" \ $(MAKE) -f "$$abs_srcdir/mini-gmp/tests/Makefile" \ VPATH="$$abs_srcdir/mini-gmp/tests" \ srcdir="$$abs_srcdir/mini-gmp/tests" \ diff --git a/mini-gmp/ChangeLog b/mini-gmp/ChangeLog index fe7d62baf..857095ac4 100644 --- a/mini-gmp/ChangeLog +++ b/mini-gmp/ChangeLog @@ -1,5 +1,8 @@ 2016-11-19 Niels Möller <nisse@lysator.liu.se> + * tests/run-tests: Set up LD_LIBRARY_PATH and DYLD_LIBRARY_PATH + for tests only, based on TEST_LIBRARY_PATH. + * tests/mini-random.h: Use name "../mini-gmp.h" for include, so we don't need any -I options to the compiler. diff --git a/mini-gmp/tests/run-tests b/mini-gmp/tests/run-tests index 17f9101bf..c7b917a5b 100755 --- a/mini-gmp/tests/run-tests +++ b/mini-gmp/tests/run-tests @@ -54,10 +54,20 @@ env_program () { fi } +TEST_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" +TEST_DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH" + +if [ "$TEST_LIBRARY_PATH" ] ; then + TEST_LD_LIBRARY_PATH="$TEST_LIBRARY_PATH:$TEST_LD_LIBRARY_PATH" + TEST_DYLD_LIBRARY_PATH="$TEST_LIBRARY_PATH:$TEST_DYLD_LIBRARY_PATH" +fi + test_program () { testname=`basename "$1" .exe` testname=`basename "$testname" -test` if [ -z "$EMULATOR" ] || head -1 "$1" | grep '^#!' > /dev/null; then + LD_LIBRARY_PATH="$TEST_LD_LIBRARY_PATH" \ + DYLD_LIBRARY_PATH="$TEST_DYLD_LIBRARY_PATH" \ "$1" $testflags else $EMULATOR "$1" $testflags |