From: vsr Date: Tue, 5 Mar 2013 05:43:07 +0000 (+0000) Subject: Fix problem of 'make installcheck' - set proper environment for tests X-Git-Tag: V6_main_FINAL~19 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c3bca71a436e3a244fb649d70ea766387012f4b9;p=modules%2Fgeom.git Fix problem of 'make installcheck' - set proper environment for tests --- diff --git a/doc/salome/examples/Makefile.am b/doc/salome/examples/Makefile.am index dc2264250..e7137ed7e 100644 --- a/doc/salome/examples/Makefile.am +++ b/doc/salome/examples/Makefile.am @@ -135,7 +135,10 @@ pyexamples_SCRIPTS = $(BAD_TESTS) $(GOOD_TESTS) EXTRA_DIST += $(pyexamples_SCRIPTS) testme.py +THIS_PYTHONPATH = $(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome +THIS_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome + installcheck-local: @for f in $(GOOD_TESTS) ; do \ - env GEOM_ROOT_DIR=$(prefix) python -B $(top_srcdir)/doc/salome/examples/testme.py $(top_srcdir)/doc/salome/examples/$$f || exit 1; \ + GEOM_ROOT_DIR=$(prefix) PYTHONPATH=$(THIS_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(THIS_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} python -B $(top_srcdir)/doc/salome/examples/testme.py $(top_srcdir)/doc/salome/examples/$$f || exit 1; \ done