From 6cc92b125ce1c14acd472dc33de3d13a3f7d0243 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 11 Mar 2021 17:10:34 +0100 Subject: [PATCH] SKETCHER_CHANGE_RADIUS_WHEN_MOVE management --- src/CTestTestfileInstall.cmake | 1 + src/SketchPlugin/CMakeLists.txt | 19 ++++++------- src/SketchPlugin/CTestTestfileInstall.cmake | 3 +++ src/SketchPlugin/tests_change_radius.set | 30 +++++++++++++++++++++ 4 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 src/SketchPlugin/tests_change_radius.set diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake index 883943974..7e87fc994 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake @@ -46,5 +46,6 @@ SUBDIRS(ConnectorAPI ExchangeAPI ModelGeomAlgo Locale + SketchPlugin test_API ) diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index c185498b0..fe67671b3 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -187,18 +187,11 @@ include(tests.set) ADD_UNIT_TESTS(${TEST_NAMES}) +include(tests.set) + if(${SKETCHER_CHANGE_RADIUS_WHEN_MOVE}) - ADD_UNIT_TESTS( - TestMoveArc.py - TestMoveBSpline.py - TestMoveBSplinePeriodic.py - TestMoveCircle.py - TestMoveEllipse.py - TestMoveEllipticArc.py - TestMoveLine.py - TestMovementComplex.py - TestMovePoint.py - ) + include(tests_change_radius.set) + ADD_UNIT_TESTS(${TEST_NAMES_CHANGE_RADIUS}) endif() ADD_RESTRICTED_TESTS( @@ -212,6 +205,10 @@ if(${HAVE_SALOME}) install(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) + if(${SKETCHER_CHANGE_RADIUS_WHEN_MOVE}) + set(TEST_NAMES ${TEST_NAMES} ${TEST_NAMES_CHANGE_RADIUS}) + install(FILES tests_change_radius.set DESTINATION ${TEST_INSTALL_DIRECTORY}) + endif() install(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) set(TMP_TESTS_NAMES) diff --git a/src/SketchPlugin/CTestTestfileInstall.cmake b/src/SketchPlugin/CTestTestfileInstall.cmake index ceaee95f9..ef551e899 100644 --- a/src/SketchPlugin/CTestTestfileInstall.cmake +++ b/src/SketchPlugin/CTestTestfileInstall.cmake @@ -18,6 +18,9 @@ # include(tests.set) +include(tests_change_radius.set) + +set(TEST_NAMES ${TEST_NAMES} ${TEST_NAMES_CHANGE_RADIUS}) foreach(tfile ${TEST_NAMES}) set(TEST_NAME ${COMPONENT_NAME}_${tfile}) diff --git a/src/SketchPlugin/tests_change_radius.set b/src/SketchPlugin/tests_change_radius.set new file mode 100644 index 000000000..bf1b9afd0 --- /dev/null +++ b/src/SketchPlugin/tests_change_radius.set @@ -0,0 +1,30 @@ +# Copyright (C) 2021 CEA/DEN, EDF R&D +# +# 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_CHANGE_RADIUS + TestMoveArc.py + TestMoveBSpline.py + TestMoveBSplinePeriodic.py + TestMoveCircle.py + TestMoveEllipse.py + TestMoveEllipticArc.py + TestMoveLine.py + TestMovementComplex.py + TestMovePoint.py +) -- 2.39.2