Installation des tests dans un sous-répertoire

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69634b1c9c88eff2b78414f835c056d61fe473aa..c1d925ba15818abe4dbdc58b2881e6238beb035f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,8 +180,8 @@ SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOM
 SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
 
 # For salome test
-SET(KERNEL_TEST_DIR ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test)
-SET(KERNEL_TEST_LIB ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/lib)
+SET(KERNEL_TEST_DIR ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/kernel)
+SET(KERNEL_TEST_LIB ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/kernel/lib)
 CONFIGURE_FILE(CTestTestfileInstall.cmake.in CTestTestfileInstall.cmake @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileInstall.cmake
         DESTINATION ${KERNEL_TEST_DIR}

diff --git a/bin/virtual_salome.py b/bin/virtual_salome.py
index 4891ea5e30eb6c10eda252d5c3cfe2ab9af44326..b82ea0a5e07bcb6e15adc45d890971686bbfc6e4 100755 (executable)
--- a/bin/virtual_salome.py
+++ b/bin/virtual_salome.py
@@ -132,7 +132,7 @@ def link_module(options):
       return
 
     module_bin_dir=os.path.join(module_dir,'bin','salome')
-    module_test_dir=os.path.join(module_dir,'bin','salome', 'test')
+    module_test_dir=os.path.join(module_dir,'bin','salome', 'test', options.module_name.lower())
     module_idl_dir=os.path.join(module_dir,'idl','salome')
     module_lib_dir=os.path.join(module_dir,get_lib_dir(),'salome')
     module_pvlib_dir=os.path.join(module_dir,get_lib_dir(),'paraview')