From bb07f9b4e1d7184fdd7ddaa68b224c47cb4feba2 Mon Sep 17 00:00:00 2001 From: mbs Date: Mon, 13 May 2024 08:42:47 +0100 Subject: [PATCH] add all test.models scripts to SHAPER tests --- src/CTestTestfileInstall.cmake | 1 + test.models/CMakeLists.txt | 21 ++++++++++++- test.models/CTestTestfileInstall.cmake | 26 ++++++++++++++++ test.models/tests.set | 42 ++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 test.models/CTestTestfileInstall.cmake create mode 100644 test.models/tests.set diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake index c559f1a55..81b24a8da 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake @@ -46,4 +46,5 @@ SUBDIRS(ConnectorAPI ModelGeomAlgo Locale test_API + TestModels ) diff --git a/test.models/CMakeLists.txt b/test.models/CMakeLists.txt index ac38f2b73..f414caccb 100644 --- a/test.models/CMakeLists.txt +++ b/test.models/CMakeLists.txt @@ -19,7 +19,7 @@ ENABLE_TESTING() -file(GLOB pyFiles "*.py") +file(GLOB pyFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.py") SET(RESTRICTED_ROOT_DIR $ENV{RESTRICTED_ROOT_DIR} CACHE PATH "Path to the restricted repository") @@ -66,3 +66,22 @@ foreach(eachFilePath ${pyFiles};${pyFilesRestr}) endforeach(eachFilePath ${ARGN}) ADD_CUSTOM_TARGET(run_models_tests COMMAND ${CMAKE_CTEST_COMMAND} -C "${CMAKE_BUILD_TYPE}" -L "models_tests") + +include(tests.set) + +if(${HAVE_SALOME}) + enable_testing() + set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/TestModels") + + install(FILES CTestTestfileInstall.cmake + DESTINATION ${TEST_INSTALL_DIRECTORY} + RENAME CTestTestfile.cmake) + install(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) + + set(TMP_TESTS_NAMES) + foreach(tfile ${TEST_NAMES}) + list(APPEND TMP_TESTS_NAMES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}) + endforeach(tfile ${TEST_NAMES}) + + install(FILES ${TMP_TESTS_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY}) +endif(${HAVE_SALOME}) diff --git a/test.models/CTestTestfileInstall.cmake b/test.models/CTestTestfileInstall.cmake new file mode 100644 index 000000000..a97b7ea71 --- /dev/null +++ b/test.models/CTestTestfileInstall.cmake @@ -0,0 +1,26 @@ +# Copyright (C) 2021-2024 CEA, EDF +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include(tests.set) + +foreach(tfile ${TEST_NAMES}) + set(TEST_NAME ${COMPONENT_NAME}_Models_${tfile}) + add_test(${TEST_NAME} python ${tfile}) + set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") +endforeach() diff --git a/test.models/tests.set b/test.models/tests.set new file mode 100644 index 000000000..198d6a522 --- /dev/null +++ b/test.models/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2021-2024 CEA, EDF +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(TEST_NAMES + angle30.py + bearing_puller.py + bobine_film_reel.py + bracket32.py + bushing.py + case24.py + clothespin.py + coronavirus.py + CSWA.py + ecran.py + flange.py + gear.py + idler_plate.py + piece_02.py + piece_09.py + piece_12.py + plug.py + sprocket.py + stair_with_cycle.py + visor_support.py + wheel_rim.py +) -- 2.39.2