From 7b2e32e291c492bc2614ad63b786c30a6ec9b9a4 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 23 Sep 2020 13:25:58 +0200
Subject: [PATCH] tests: do not override DYLD_LIBRARY_PATH

* tests/run.in: Here.
---
 tests/run.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/run.in b/tests/run.in
index e86943b6d..dd053011d 100755
--- a/tests/run.in
+++ b/tests/run.in
@@ -46,7 +46,8 @@ PATH="@abs_top_builddir@/bin:$PATH"
 export PATH
 
 test -z "$1" &&
-    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath exec $PREFIXCMD @PYTHON@
+    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
+    exec $PREFIXCMD @PYTHON@
 srcdir="@srcdir@"
 
 # Reset CFLAGS, because some tests call the compiler, and we do not
@@ -103,18 +104,18 @@ export srcdir
 
 case $1 in
   *.ipynb)
-    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
+    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
     PYTHONIOENCODING=utf-8:surrogateescape \
     exec $PREFIXCMD @PYTHON@ @abs_srcdir@/python/ipnbdoctest.py "$@";;
   *.py)
-    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
+    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
     exec $PREFIXCMD @PYTHON@ "$@";;
   *.test)
     exec sh -x "$@";;
   *.pl)
     exec $PERL "$@";;
   *python*|*jupyter*)
-    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
+    PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
     exec $PREFIXCMD "$@";;
   *)
     echo "Unknown extension" >&2