tests: don't wipe python environment

* tests/run.in: keep original PYTHONPATH contents
* NEWS: mention the bug
This commit is contained in:
Antoine Martin 2022-03-10 15:49:46 +01:00
parent 530cf7ca47
commit 187bacc254
2 changed files with 9 additions and 3 deletions

3
NEWS
View file

@ -77,6 +77,9 @@ New in spot 2.10.4.dev (net yet released)
- Do not use the seq command in test cases, it is not available
everywhere.
- Do not erase the previous contents of the PYTHONPATH environment
variable when running tests, prepend to it instead.
New in spot 2.10.4 (2022-02-01)
Bug fixed:

View file

@ -104,18 +104,21 @@ export srcdir
case $1 in
*.ipynb)
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
PYTHONPATH=$pypath:$PYTHONPATH \
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:$DYLD_LIBRARY_PATH \
PYTHONPATH=$pypath:$PYTHONPATH \
DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
exec $PREFIXCMD @PYTHON@ "$@";;
*.test)
exec sh -x "$@";;
*.pl)
exec $PERL "$@";;
*python*|*jupyter*|*pypy*)
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
PYTHONPATH=$pypath:$PYTHONPATH \
DYLD_LIBRARY_PATH=$modpath:$DYLD_LIBRARY_PATH \
exec $PREFIXCMD "$@";;
*)
echo "Unknown extension" >&2