OK for test.API

diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake
index 3e2903ec20b94e334d87ef6dce2b425c3122b8d6..883943974a53dd43670744aa4a7100d4ec7ae409 100644 (file)
--- a/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@ -46,4 +46,5 @@ SUBDIRS(ConnectorAPI
         ExchangeAPI
         ModelGeomAlgo
         Locale
+        test_API
 )

diff --git a/test.API/SHAPER/CMakeLists.txt b/test.API/SHAPER/CMakeLists.txt
index 6d4f981eafbdac8a6227048aadf365aa041c4692..6300e90a5e4931f5783067a3cc6b6007a91ef47a 100644 (file)
--- a/test.API/SHAPER/CMakeLists.txt
+++ b/test.API/SHAPER/CMakeLists.txt
@@ -19,34 +19,18 @@
 
 INCLUDE(UnitTest)
 
-ADD_UNIT_TESTS_API(
-  Primitives/TestBox.py
-  Primitives/TestCone.py
-  Primitives/TestCylinder.py
-  Primitives/TestSphere.py
-  Primitives/TestTorus.py
-  Primitives/TestAPI_Box.py
-  Primitives/TestAPI_Cone.py
-  Primitives/TestAPI_Cylinder.py
-  Primitives/TestAPI_Sphere.py
-  Primitives/TestAPI_Torus.py
-  #GDML/TestConeSegment.py
-  #GDML/TestAPI_ConeSegment.py
-  Transformations/TestAPI_MultiRotation.py
-  Transformations/TestAPI_MultiTranslation.py
-  Transformations/TestAPI_Rotation.py
-  Transformations/TestAPI_Scale.py
-  Transformations/TestAPI_Symmetry.py
-  Transformations/TestAPI_Translation.py
-  Transformations/TestMultiRotation.py
-  Transformations/TestMultiTranslation.py
-  Transformations/TestRotation.py
-  Transformations/TestScale.py
-  Transformations/TestSymmetry.py
-  Transformations/TestTranslation_1.py
-  Transformations/TestTranslation_2.py
-  Transformations/TestTranslation_3.py
-  Transformations/TestTranslation_4.py
-  Transformations/TestTranslation_5.py
-  Transformations/TestTranslation.py
-)
+include(tests.set)
+
+ADD_UNIT_TESTS(${TEST_NAMES})
+
+if(${HAVE_SALOME})
+  enable_testing()
+  set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/test_API")
+  
+  install(FILES CTestTestfileInstall.cmake
+  DESTINATION ${TEST_INSTALL_DIRECTORY}
+  RENAME CTestTestfile.cmake)
+  install(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
+  message(${TEST_NAMES})
+  install(FILES ${TEST_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY})
+endif(${HAVE_SALOME})

diff --git a/test.API/SHAPER/CTestTestfileInstall.cmake b/test.API/SHAPER/CTestTestfileInstall.cmake
new file mode 100644 (file)
index 0000000..38b15e8
--- /dev/null
+++ b/test.API/SHAPER/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# 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
+#
+
+include(tests.set)
+
+foreach(tfile ${TEST_NAMES})
+  set(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  get_filename_component(tfile_without_dir ${tfile} NAME)
+  add_test(${TEST_NAME} python ${tfile_without_dir})
+  set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${SALOME_TEST_LABEL_ADV}")
+endforeach()

diff --git a/test.API/SHAPER/tests.set b/test.API/SHAPER/tests.set
new file mode 100644 (file)
index 0000000..d3bd600
--- /dev/null
+++ b/test.API/SHAPER/tests.set
@@ -0,0 +1,50 @@
+# 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
+  Primitives/TestBox.py
+  Primitives/TestCone.py
+  Primitives/TestCylinder.py
+  Primitives/TestSphere.py
+  Primitives/TestTorus.py
+  Primitives/TestAPI_Box.py
+  Primitives/TestAPI_Cone.py
+  Primitives/TestAPI_Cylinder.py
+  Primitives/TestAPI_Sphere.py
+  Primitives/TestAPI_Torus.py
+  #GDML/TestConeSegment.py
+  #GDML/TestAPI_ConeSegment.py
+  Transformations/TestAPI_MultiRotation.py
+  Transformations/TestAPI_MultiTranslation.py
+  Transformations/TestAPI_Rotation.py
+  Transformations/TestAPI_Scale.py
+  Transformations/TestAPI_Symmetry.py
+  Transformations/TestAPI_Translation.py
+  Transformations/TestMultiRotation.py
+  Transformations/TestMultiTranslation.py
+  Transformations/TestRotation.py
+  Transformations/TestScale.py
+  Transformations/TestSymmetry.py
+  Transformations/TestTranslation_1.py
+  Transformations/TestTranslation_2.py
+  Transformations/TestTranslation_3.py
+  Transformations/TestTranslation_4.py
+  Transformations/TestTranslation_5.py
+  Transformations/TestTranslation.py
+)