* wrap/python/tests/run.in: Do not override PYTHONPATH, just add

to it.
Report from Akim Demaille.
This commit is contained in:
Alexandre Duret-Lutz 2004-11-28 17:12:21 +00:00
parent c0ed084e7d
commit fdeea6dbf8
2 changed files with 8 additions and 2 deletions

View file

@ -1,5 +1,9 @@
2004-11-28 Alexandre Duret-Lutz <adl@src.lip6.fr>
* wrap/python/tests/run.in: Do not override PYTHONPATH, just add
to it.
Report from Akim Demaille.
* src/sanity/style.test: Make sure grep supports the options put
into GREP_OPTIONS.

View file

@ -30,12 +30,14 @@ test -n "$srcdir" && test -z "$VERBOSE" && exec >/dev/null 2>&1
# path of dependent libraries in each library).
modpath='../.libs:@top_builddir@/src/.libs:@top_builddir@/buddy/src/.libs'
pypath='..:@srcdir@/..:$PYTHONPATH'
test -z "$1" &&
PYTHONPATH='..:@srcdir@/..' DYLD_LIBRARY_PATH=$modpath exec @PYTHON@
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath exec @PYTHON@
case $1 in
*.py)
PYTHONPATH='..:@srcdir@/..' DYLD_LIBRARY_PATH=$modpath exec @PYTHON@ "$@";;
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath exec @PYTHON@ "$@";;
*.test)
exec sh -x "$@";;
*)