diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 5cfcac45..c2270ce5 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -62,7 +62,8 @@ if WITH_PYTHON check-local: @for f in $(XMLS) ; do test -f $$f || $(LN_S) $(srcdir)/$$f . ; done @echo "## running Python regression tests" - @(export LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ + @(export PYTHONPATH="..:../.libs:$(srcdir)/..:$$PYTHONPATH" ; \ + export LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ export DYLD_LIBRARY_PATH="$(top_builddir)/.libs:$$DYLD_LIBRARY_PATH" ; \ export PATH="$(top_builddir)/.libs:$$PATH" ; \ for test in $(PYTESTS) ; do \ diff --git a/python/tests/setup_test.py b/python/tests/setup_test.py index 84f07b18..f893e56e 100644 --- a/python/tests/setup_test.py +++ b/python/tests/setup_test.py @@ -1,7 +1,5 @@ import os import sys -sys.path += ('..', '../.libs') - if hasattr(os, 'add_dll_directory'): os.add_dll_directory(os.path.join(os.getcwd(), '..', '..', '.libs'))