diff --git a/ChangeLog b/ChangeLog index d5146f349..40702f685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-11-28 Alexandre Duret-Lutz + * 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. diff --git a/wrap/python/tests/run.in b/wrap/python/tests/run.in index 9e3970efc..64d92c19f 100644 --- a/wrap/python/tests/run.in +++ b/wrap/python/tests/run.in @@ -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 "$@";; *)