From: aguerre <aguerre>
Date: Fri, 6 Sep 2013 15:26:30 +0000 (+0000)
Subject: bug fix
X-Git-Tag: begin_agr_portmanager_branch_131004~30
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=729748315de20e68d963f089011b6022dd0a667d;p=modules%2Fkernel.git

bug fix
---

diff --git a/bin/appliskel/tests/concurrentSession/CMakeLists.txt b/bin/appliskel/tests/concurrentSession/CMakeLists.txt
index 59df15a29..9c865f91a 100644
--- a/bin/appliskel/tests/concurrentSession/CMakeLists.txt
+++ b/bin/appliskel/tests/concurrentSession/CMakeLists.txt
@@ -23,20 +23,16 @@ ENABLE_TESTING()
 # define environment for running tests
 SET(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
 
-SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
-IF(NOT EXISTS ${KERNEL_ROOT_DIR})
-  MESSAGE(FATAL_ERROR "KERNEL_ROOT_DIR undefined")
-ENDIF(NOT EXISTS ${KERNEL_ROOT_DIR})
-
-SET(THIS_PYTHONPATH $ENV{KERNEL_ROOT_DIR}/bin/salome:$ENV{KERNEL_ROOT_DIR}/lib/python$ENV{PYTHON_VERSION}/site-packages/salome:$ENV{KERNEL_ROOT_DIR}/lib64/python$ENV{PYTHON_VERSION}/site-packages/salome:$ENV{PYTHONPATH})
-SET(THIS_LD_LIBRARY_PATH $ENV{KERNEL_ROOT_DIR}/lib/salome:$ENV{LD_LIBRARY_PATH})
+SET(THIS_PYTHONPATH ${CMAKE_SOURCE_DIR}/bin/salome:$ENV{PYTHONPATH})
+#SET(THIS_LD_LIBRARY_PATH $ENV{CMAKE_SOURCE_DIR}/lib/salome:$ENV{LD_LIBRARY_PATH})
 
 # add tests (use make test to run)
 FILE(GLOB tests "${CMAKE_CURRENT_SOURCE_DIR}/Test*.py")
 FOREACH(file ${tests})
   GET_FILENAME_COMPONENT(testname ${file} NAME_WE)
   ADD_TEST(${testname} ${PYTHON_EXECUTABLE} "${file}")
-  SET_PROPERTY(TEST ${testname} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${THIS_PYTHONPATH} LD_LIBRARY_PATH=${THIS_LD_LIBRARY_PATH})
+#  SET_PROPERTY(TEST ${testname} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${THIS_PYTHONPATH} LD_LIBRARY_PATH=${THIS_LD_LIBRARY_PATH})
+  SET_PROPERTY(TEST ${testname} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${THIS_PYTHONPATH})
 ENDFOREACH()
 
 # install Python scripts