Squash unstable

This commit is contained in:
NathalieGore 2024-10-16 10:22:13 +02:00
parent a1e2cdd1ed
commit 3d4fc4e1e2
3 changed files with 27 additions and 2 deletions

View File

@ -45,13 +45,26 @@ IF(SALOME_BUILD_TESTS)
SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}" LABELS "examples")
ENDFOREACH()
# Add tests for 'make test'
# -------------------------
SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
FOREACH(test ${UNSTABLE_TESTS})
GET_FILENAME_COMPONENT(testname ${test} NAME_WE)
SET(testname "EXAMPLES_${testname}")
ADD_TEST(NAME ${testname}
COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${CMAKE_CURRENT_SOURCE_DIR}/${test})
SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}" LABELS "examples")
ENDFOREACH()
ENDIF()
# Install example scripts and data
# --------------------------------
IF(SALOME_BUILD_TESTS OR SALOME_BUILD_DOC)
INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} DESTINATION ${EXAMPLES_INSTALL_DIRECTORY})
INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${UNSTABLE_TESTS} DESTINATION ${EXAMPLES_INSTALL_DIRECTORY})
INSTALL(FILES mechanic.py DESTINATION ${SALOME_INSTALL_BINS})
INSTALL(DIRECTORY data DESTINATION ${EXAMPLES_INSTALL_DIRECTORY})
ENDIF()

View File

@ -32,3 +32,12 @@ FOREACH(tfile ${_all_tests})
ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${SCRIPTS_DIR}/${tfile})
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME};${COMPONENT_NAME}_examples")
ENDFOREACH()
SET(_unstable_tests ${UNSTABLE_TESTS})
LIST(SORT _unstable_tests)
FOREACH(tfile ${_unstable_tests})
GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
SET(TEST_NAME UNSTABLE_SMESH_${BASE_NAME})
ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${SCRIPTS_DIR}/${tfile})
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "UNSTABLE;UNSTABLE_SMESH;${COMPONENT_NAME}_examples")
ENDFOREACH()

View File

@ -152,8 +152,11 @@ ENDIF(NOT WIN32)
# The following tests can be executed with both 'make test' and 'salome test'.
# ----------------------------------------------------------------------------
SET(GOOD_TESTS
SET(UNSTABLE_TESTS
cartesian_algo.py
)
SET(GOOD_TESTS
creating_meshes_ex02.py
creating_meshes_ex06.py
creating_meshes_ex07.py