multithread: Move in MULTITHREAD label and remove from BLSURFPLUGIN label

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e052447311f940e73f8dc284e4f11b6c9d079549..be451ae4bcac3639511546e6fc9c68ef3963e51d 100644 (file)
--- 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 c38c8754c3df01b56382920804c810611294da5b..5e8b437b7ebbedc0852a75c1ea20604adfbea785 100644 (file)
--- 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 7d718a58787846b3fd58dacc20615b2f8f0ab7f0..973556f78b46c02f3c687e4f4497b78e7d2e58b0 100644 (file)
--- 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