alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: don't wipe python environment

Browse source 
* 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 • committed by Alexandre Duret-Lutz
parent d61d6e5e2f
commit 734de00bfd
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -13,6 +13,9 @@ New in spot 2.10.4.dev (net yet released)
- Do not use the seq command in test cases, it is not available - Do not use the seq command in test cases, it is not available
everywhere. 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) New in spot 2.10.4 (2022-02-01)
Bug fixed: Bug fixed:

9
tests/run.in
View file

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