From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Wed, 23 Oct 2024 08:24:55 +0000 (+0200)
Subject: Installation des tests dans un sous-répertoire
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=58396dbf906409553f2f176fd3ecf4c4359505d5;p=modules%2Fkernel.git

Installation des tests dans un sous-répertoire
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69634b1c9..c1d925ba1 100755
--- 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 4891ea5e3..b82ea0a5e 100755
--- 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')