From: Emmanuel STRÉBY Date: Thu, 28 Mar 2024 17:24:22 +0000 (+0100) Subject: multithread: Move in MULTITHREAD label and remove from BLSURFPLUGIN label X-Git-Tag: V9_13_0a1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fesy%2Fmultithread;p=plugins%2Fblsurfplugin.git multithread: Move in MULTITHREAD label and remove from BLSURFPLUGIN label --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e052447..be451ae 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,6 +20,7 @@ INCLUDE(tests.set) SET(COMPONENT_NAME BLSURFPLUGIN) +SET(MULTITHREAD_COMPONENT_NAME MULTITHREAD) SET(TEST_INSTALL_DIRECTORY ${SALOME_BLSURFPLUGIN_INSTALL_TESTS}) @@ -34,8 +35,16 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") ENDFOREACH() +FOREACH(tfile ${MULTITHREAD_TEST_NAMES}) + SET(MULTITHREAD_TEST_NAME ${MULTITHREAD_COMPONENT_NAME}_${tfile}) + ADD_TEST(NAME ${MULTITHREAD_TEST_NAME} + COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${MULTITHREAD_TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") + SET_TESTS_PROPERTIES(${MULTITHREAD_TEST_NAME} PROPERTIES LABELS MULTITHREAD) +ENDFOREACH() + # salome test -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${TEST_NAMES} ${MULTITHREAD_TEST_NAMES}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/tests/CTestTestfileInstall.cmake b/tests/CTestTestfileInstall.cmake index c38c875..5e8b437 100644 --- a/tests/CTestTestfileInstall.cmake +++ b/tests/CTestTestfileInstall.cmake @@ -20,6 +20,7 @@ INCLUDE(tests.set) SET(COMPONENT_NAME BLSURFPLUGIN) +SET(MULTITHREAD_COMPONENT_NAME MULTITHREAD) SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py") SET(TIMEOUT 300) @@ -29,3 +30,9 @@ FOREACH(tfile ${TEST_NAMES} ${EXAMPLE_NAMES}) ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") ENDFOREACH() + +FOREACH(tfile ${MULTITHREAD_TEST_NAMES}) + SET(MULTITHREAD_TEST_NAME ${MULTITHREAD_COMPONENT_NAME}_${tfile}) + ADD_TEST(${MULTITHREAD_TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) + SET_TESTS_PROPERTIES(${MULTITHREAD_TEST_NAME} PROPERTIES LABELS MULTITHREAD) +ENDFOREACH() \ No newline at end of file diff --git a/tests/tests.set b/tests/tests.set index 7d718a5..973556f 100644 --- a/tests/tests.set +++ b/tests/tests.set @@ -23,7 +23,6 @@ SET(TEST_NAMES attractor_point_outside_face enforced_internal_vertex enforced_vertex - multithread periodicity_2D_prepro #periodicity_prepro # already tested in examples periodicity_reflexion_2D_prepro @@ -36,3 +35,7 @@ SET(TEST_NAMES remove_tiny_edges sphere ) + +SET(MULTITHREAD_TEST_NAMES + multithread +) \ No newline at end of file