From 58396dbf906409553f2f176fd3ecf4c4359505d5 Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Wed, 23 Oct 2024 10:24:55 +0200 Subject: [PATCH] =?utf8?q?Installation=20des=20tests=20dans=20un=20sous-r?= =?utf8?q?=C3=A9pertoire?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++-- bin/virtual_salome.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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') -- 2.39.2