From 3d4fc4e1e26e20c1fb0dd799f72225fb7ab54e83 Mon Sep 17 00:00:00 2001 From: NathalieGore Date: Wed, 16 Oct 2024 10:22:13 +0200 Subject: [PATCH] Squash unstable --- doc/examples/CMakeLists.txt | 15 ++++++++++++++- doc/examples/CTestTestfileInstall.cmake | 9 +++++++++ doc/examples/tests.set | 5 ++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt index 1c69d3ab1..2a11075a3 100644 --- a/doc/examples/CMakeLists.txt +++ b/doc/examples/CMakeLists.txt @@ -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() diff --git a/doc/examples/CTestTestfileInstall.cmake b/doc/examples/CTestTestfileInstall.cmake index 0414df333..732d7cd30 100644 --- a/doc/examples/CTestTestfileInstall.cmake +++ b/doc/examples/CTestTestfileInstall.cmake @@ -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() diff --git a/doc/examples/tests.set b/doc/examples/tests.set index ca05a2a96..b02b0f971 100644 --- a/doc/examples/tests.set +++ b/doc/examples/tests.set @@ -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 -- 2.39.2