tests: do not override DYLD_LIBRARY_PATH
* tests/run.in: Here.
This commit is contained in:
parent
2a7bbb1cdc
commit
7b2e32e291
1 changed files with 5 additions and 4 deletions
|
|
@ -46,7 +46,8 @@ PATH="@abs_top_builddir@/bin:$PATH"
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
test -z "$1" &&
|
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@"
|
srcdir="@srcdir@"
|
||||||
|
|
||||||
# Reset CFLAGS, because some tests call the compiler, and we do not
|
# Reset CFLAGS, because some tests call the compiler, and we do not
|
||||||
|
|
@ -103,18 +104,18 @@ export srcdir
|
||||||
|
|
||||||
case $1 in
|
case $1 in
|
||||||
*.ipynb)
|
*.ipynb)
|
||||||
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
|
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
|
||||||
PYTHONIOENCODING=utf-8:surrogateescape \
|
PYTHONIOENCODING=utf-8:surrogateescape \
|
||||||
exec $PREFIXCMD @PYTHON@ @abs_srcdir@/python/ipnbdoctest.py "$@";;
|
exec $PREFIXCMD @PYTHON@ @abs_srcdir@/python/ipnbdoctest.py "$@";;
|
||||||
*.py)
|
*.py)
|
||||||
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
|
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
|
||||||
exec $PREFIXCMD @PYTHON@ "$@";;
|
exec $PREFIXCMD @PYTHON@ "$@";;
|
||||||
*.test)
|
*.test)
|
||||||
exec sh -x "$@";;
|
exec sh -x "$@";;
|
||||||
*.pl)
|
*.pl)
|
||||||
exec $PERL "$@";;
|
exec $PERL "$@";;
|
||||||
*python*|*jupyter*)
|
*python*|*jupyter*)
|
||||||
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
|
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
|
||||||
exec $PREFIXCMD "$@";;
|
exec $PREFIXCMD "$@";;
|
||||||
*)
|
*)
|
||||||
echo "Unknown extension" >&2
|
echo "Unknown extension" >&2
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue