From 7285d0445e242ec43a7fb0f25f50cceb7da68fbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Tue, 24 Mar 2015 17:12:51 +0100 Subject: [PATCH] switch to new salome test procedure --- doc/salome/examples/CMakeLists.txt | 223 +++++++++--------- .../examples/CTestTestfileInstall.cmake | 141 +++++++++++ 2 files changed, 257 insertions(+), 107 deletions(-) create mode 100644 doc/salome/examples/CTestTestfileInstall.cmake diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 6a0baa09a..a437b4078 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -18,117 +18,117 @@ # SET(BAD_TESTS - repairing_operations_ex09.py + repairing_operations_ex09.py ) SET(GOOD_TESTS - 3dsketcher.py - advanced_geom_objs_ex01.py - advanced_geom_objs_ex02.py - advanced_geom_objs_ex03.py - angle.py - arranging_study_objects.py - basic_geom_objs_ex01.py - basic_geom_objs_ex02.py - basic_geom_objs_ex03.py - basic_geom_objs_ex04.py - basic_geom_objs_ex05.py - basic_geom_objs_ex06.py - basic_geom_objs_ex07.py - basic_geom_objs_ex08.py - basic_geom_objs_ex09.py - basic_geom_objs_ex10.py - basic_operations_ex01.py - basic_operations_ex02.py - basic_operations_ex03.py - basic_operations_ex04.py - basic_properties.py - blocks_operations_ex01.py - blocks_operations_ex02.py - blocks_operations_ex03.py - boolean_operations_ex01.py - boolean_operations_ex02.py - boolean_operations_ex03.py - boolean_operations_ex04.py - bounding_box.py - building_by_blocks_ex01.py - building_by_blocks_ex02.py - center_of_mass.py - check_compound_of_blocks.py - check_self_intersections.py - check_shape.py - complex_objs_ex01.py - complex_objs_ex02.py - complex_objs_ex03.py - complex_objs_ex04.py - complex_objs_ex05.py - complex_objs_ex06.py - complex_objs_ex07.py - complex_objs_ex08.py - complex_objs_ex09.py + 3dsketcher.py + advanced_geom_objs_ex01.py + advanced_geom_objs_ex02.py + advanced_geom_objs_ex03.py + angle.py + arranging_study_objects.py + basic_geom_objs_ex01.py + basic_geom_objs_ex02.py + basic_geom_objs_ex03.py + basic_geom_objs_ex04.py + basic_geom_objs_ex05.py + basic_geom_objs_ex06.py + basic_geom_objs_ex07.py + basic_geom_objs_ex08.py + basic_geom_objs_ex09.py + basic_geom_objs_ex10.py + basic_operations_ex01.py + basic_operations_ex02.py + basic_operations_ex03.py + basic_operations_ex04.py + basic_properties.py + blocks_operations_ex01.py + blocks_operations_ex02.py + blocks_operations_ex03.py + boolean_operations_ex01.py + boolean_operations_ex02.py + boolean_operations_ex03.py + boolean_operations_ex04.py + bounding_box.py + building_by_blocks_ex01.py + building_by_blocks_ex02.py + center_of_mass.py + check_compound_of_blocks.py + check_self_intersections.py + check_shape.py + complex_objs_ex01.py + complex_objs_ex02.py + complex_objs_ex03.py + complex_objs_ex04.py + complex_objs_ex05.py + complex_objs_ex06.py + complex_objs_ex07.py + complex_objs_ex08.py + complex_objs_ex09.py complex_objs_ex10.py complex_objs_ex11.py - free_boundaries.py - free_faces.py - GEOM_box.py - get_non_blocks.py - import_export.py - inertia.py - min_distance.py - normal_face.py - notebook_geom.py + free_boundaries.py + free_faces.py + GEOM_box.py + get_non_blocks.py + import_export.py + inertia.py + min_distance.py + normal_face.py + notebook_geom.py polyline.py - point_coordinates.py - primitives_ex01.py - primitives_ex02.py - primitives_ex03.py - primitives_ex04.py - primitives_ex05.py - primitives_ex06.py - primitives_ex07.py - repairing_operations_ex01.py - repairing_operations_ex02.py - repairing_operations_ex03.py - repairing_operations_ex04.py - repairing_operations_ex05.py - repairing_operations_ex06.py - repairing_operations_ex07.py - repairing_operations_ex08.py - repairing_operations_ex10.py - repairing_operations_ex11.py - repairing_operations_ex12.py - sketcher.py - tolerance.py - topological_geom_objs_ex01.py - topological_geom_objs_ex02.py - topological_geom_objs_ex03.py - topological_geom_objs_ex04.py - topological_geom_objs_ex05.py - topological_geom_objs_ex06.py - transformation_operations_ex01.py - transformation_operations_ex02.py - transformation_operations_ex03.py - transformation_operations_ex04.py - transformation_operations_ex05.py - transformation_operations_ex06.py - transformation_operations_ex07.py - transformation_operations_ex08.py - transformation_operations_ex09.py - transformation_operations_ex10.py - transformation_operations_ex11.py - transformation_operations_ex12.py - transformation_operations_ex13.py - transformation_operations_ex14.py - viewing_geom_objs_ex01.py - viewing_geom_objs_ex02.py - viewing_geom_objs_ex03.py - viewing_geom_objs_ex04.py - whatis.py - working_with_groups_ex01.py - working_with_groups_ex02.py - working_with_groups_ex03.py - working_with_groups_ex04.py - working_with_groups_ex05.py + point_coordinates.py + primitives_ex01.py + primitives_ex02.py + primitives_ex03.py + primitives_ex04.py + primitives_ex05.py + primitives_ex06.py + primitives_ex07.py + repairing_operations_ex01.py + repairing_operations_ex02.py + repairing_operations_ex03.py + repairing_operations_ex04.py + repairing_operations_ex05.py + repairing_operations_ex06.py + repairing_operations_ex07.py + repairing_operations_ex08.py + repairing_operations_ex10.py + repairing_operations_ex11.py + repairing_operations_ex12.py + sketcher.py + tolerance.py + topological_geom_objs_ex01.py + topological_geom_objs_ex02.py + topological_geom_objs_ex03.py + topological_geom_objs_ex04.py + topological_geom_objs_ex05.py + topological_geom_objs_ex06.py + transformation_operations_ex01.py + transformation_operations_ex02.py + transformation_operations_ex03.py + transformation_operations_ex04.py + transformation_operations_ex05.py + transformation_operations_ex06.py + transformation_operations_ex07.py + transformation_operations_ex08.py + transformation_operations_ex09.py + transformation_operations_ex10.py + transformation_operations_ex11.py + transformation_operations_ex12.py + transformation_operations_ex13.py + transformation_operations_ex14.py + viewing_geom_objs_ex01.py + viewing_geom_objs_ex02.py + viewing_geom_objs_ex03.py + viewing_geom_objs_ex04.py + whatis.py + working_with_groups_ex01.py + working_with_groups_ex02.py + working_with_groups_ex03.py + working_with_groups_ex04.py + working_with_groups_ex05.py working_with_groups_ex06.py ) IF(CAS_VERSION_STR VERSION_GREATER "6.8.0") @@ -143,10 +143,19 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) FOREACH(test ${GOOD_TESTS}) GET_FILENAME_COMPONENT(testname ${test} NAME_WE) - ADD_TEST(NAME ${testname} + ADD_TEST(NAME ${testname} COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py ${CMAKE_CURRENT_SOURCE_DIR}/${test}) - SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}") + SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() # install Python scripts SALOME_INSTALL_SCRIPTS("${EXAMPLES_TESTS}" ${SALOME_INSTALL_DOC}/examples/GEOM) + +# Application tests + +SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test) +INSTALL(FILES ${GOOD_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY}) + +INSTALL(FILES CTestTestfileInstall.cmake + DESTINATION ${TEST_INSTALL_DIRECTORY} + RENAME CTestTestfile.cmake) diff --git a/doc/salome/examples/CTestTestfileInstall.cmake b/doc/salome/examples/CTestTestfileInstall.cmake new file mode 100644 index 000000000..9781ca583 --- /dev/null +++ b/doc/salome/examples/CTestTestfileInstall.cmake @@ -0,0 +1,141 @@ +# Copyright (C) 2015 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(SALOME_TEST_DRIVER "$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/appliskel/salome_test_driver.py") +SET(COMPONENT_NAME GEOM) +SET(TIMEOUT 300) + +SET(GOOD_TESTS + 3dsketcher + advanced_geom_objs_ex01 + advanced_geom_objs_ex02 + advanced_geom_objs_ex03 + angle + arranging_study_objects + basic_geom_objs_ex01 + basic_geom_objs_ex02 + basic_geom_objs_ex03 + basic_geom_objs_ex04 + basic_geom_objs_ex05 + basic_geom_objs_ex06 + basic_geom_objs_ex07 + basic_geom_objs_ex08 + basic_geom_objs_ex09 + basic_geom_objs_ex10 + basic_operations_ex01 + basic_operations_ex02 + basic_operations_ex03 + basic_operations_ex04 + basic_properties + blocks_operations_ex01 + blocks_operations_ex02 + blocks_operations_ex03 + boolean_operations_ex01 + boolean_operations_ex02 + boolean_operations_ex03 + boolean_operations_ex04 + bounding_box + building_by_blocks_ex01 + building_by_blocks_ex02 + center_of_mass + check_compound_of_blocks + check_self_intersections + check_shape + complex_objs_ex01 + complex_objs_ex02 + complex_objs_ex03 + complex_objs_ex04 + complex_objs_ex05 + complex_objs_ex06 + complex_objs_ex07 + complex_objs_ex08 + complex_objs_ex09 + complex_objs_ex10 + complex_objs_ex11 + free_boundaries + free_faces + GEOM_box + get_non_blocks + import_export + inertia + min_distance + normal_face + notebook_geom + polyline + point_coordinates + primitives_ex01 + primitives_ex02 + primitives_ex03 + primitives_ex04 + primitives_ex05 + primitives_ex06 + primitives_ex07 + repairing_operations_ex01 + repairing_operations_ex02 + repairing_operations_ex03 + repairing_operations_ex04 + repairing_operations_ex05 + repairing_operations_ex06 + repairing_operations_ex07 + repairing_operations_ex08 + repairing_operations_ex10 + repairing_operations_ex11 + repairing_operations_ex12 + sketcher + tolerance + topological_geom_objs_ex01 + topological_geom_objs_ex02 + topological_geom_objs_ex03 + topological_geom_objs_ex04 + topological_geom_objs_ex05 + topological_geom_objs_ex06 + transformation_operations_ex01 + transformation_operations_ex02 + transformation_operations_ex03 + transformation_operations_ex04 + transformation_operations_ex05 + transformation_operations_ex06 + transformation_operations_ex07 + transformation_operations_ex08 + transformation_operations_ex09 + transformation_operations_ex10 + transformation_operations_ex11 + transformation_operations_ex12 + transformation_operations_ex13 + transformation_operations_ex14 + viewing_geom_objs_ex01 + viewing_geom_objs_ex02 + viewing_geom_objs_ex03 + viewing_geom_objs_ex04 + whatis + working_with_groups_ex01 + working_with_groups_ex02 + working_with_groups_ex03 + working_with_groups_ex04 + working_with_groups_ex05 + working_with_groups_ex06 +) +# CAS_VERSION > "6.8.0" +LIST(APPEND GOOD_TESTS fast_intersection) + +FOREACH(tfile ${GOOD_TESTS}) + SET(TEST_NAME GEOM_${tfile}) + ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") +ENDFOREACH() -- 2.39.2