From: vsr Date: Wed, 6 Mar 2013 13:56:49 +0000 (+0000) Subject: Merge from V6_main 06/03/2013 X-Git-Tag: V7_1_0~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1dac6744a7a5bfdd6ccd50ffbcb8e445e37b2080;p=modules%2Fgeom.git Merge from V6_main 06/03/2013 --- 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