From: Cédric Aguerre Date: Thu, 19 May 2016 12:49:08 +0000 (+0200) Subject: define shared test sets X-Git-Tag: V8_1_0a1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ff141a44664fc17363516393b54032388cb9bf31;p=modules%2Fparavis.git define shared test sets --- diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt index 64eb0832..18e26e5a 100644 --- a/test/VisuPrs/2D_viewer/CMakeLists.txt +++ b/test/VisuPrs/2D_viewer/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0) -SET(ALL_TESTS A0 A1) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME 2DVIEWER_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/2D_viewer) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake index f8f8f4d4..2df7f3f0 100644 --- a/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake +++ b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_2DVIEWER_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" 2DVIEWER BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" 2DVIEWER EXTRA) diff --git a/test/VisuPrs/2D_viewer/tests.set b/test/VisuPrs/2D_viewer/tests.set new file mode 100644 index 00000000..1945b635 --- /dev/null +++ b/test/VisuPrs/2D_viewer/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0) + +SET(EXTRA_TESTS A1) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt index 3b4d8b53..ccd21f10 100755 --- a/test/VisuPrs/3D_viewer/CMakeLists.txt +++ b/test/VisuPrs/3D_viewer/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A1 B0) -SET(ALL_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME 3DVIEWER_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/3D_viewer) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake index a4da690c..d39ba6b2 100644 --- a/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake +++ b/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_3DVIEWER_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" 3DVIEWER BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" 3DVIEWER EXTRA) diff --git a/test/VisuPrs/3D_viewer/tests.set b/test/VisuPrs/3D_viewer/tests.set new file mode 100644 index 00000000..30c5be97 --- /dev/null +++ b/test/VisuPrs/3D_viewer/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A1 B0) + +SET(EXTRA_TESTS A2 A3 A4 A5 A6 A7 A8 A9 B1 B2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt index cd5af96e..d4445b2e 100755 --- a/test/VisuPrs/Animation/CMakeLists.txt +++ b/test/VisuPrs/Animation/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A1 B2 C0 D1 E0 F2 G0 H1) -SET(ALL_TESTS A0 A1 A2 A4 A7 A8 B2 B5 B6 C0 C1 C3 C8 D1 D2 D6 D9 - E0 E4 E7 E8 F2 F5 F6 G0 G3 G4 G8 H1 H2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ANIMATION_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Animation) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/Animation/CTestTestfileInstall.cmake b/test/VisuPrs/Animation/CTestTestfileInstall.cmake index ec2970ac..2a734ce2 100644 --- a/test/VisuPrs/Animation/CTestTestfileInstall.cmake +++ b/test/VisuPrs/Animation/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A4 A7 A8 B2 B5 B6 C0 C1 C3 C8 D1 D2 D6 D9 - E0 E4 E7 E8 F2 F5 F6 G0 G3 G4 G8 H1 H2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_ANIMATION_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" ANIMATION BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" ANIMATION EXTRA) diff --git a/test/VisuPrs/Animation/tests.set b/test/VisuPrs/Animation/tests.set new file mode 100644 index 00000000..9e26d636 --- /dev/null +++ b/test/VisuPrs/Animation/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A1 B2 C0 D1 E0 F2 G0 H1) + +SET(EXTRA_TESTS A0 A2 A4 A7 A8 B5 B6 C1 C3 C8 D2 D6 D9 + E4 E7 E8 F5 F6 G3 G4 G8 H2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/CTestTestfileInstall.cmake b/test/VisuPrs/CTestTestfileInstall.cmake index 63506ab1..ed9fbc5c 100644 --- a/test/VisuPrs/CTestTestfileInstall.cmake +++ b/test/VisuPrs/CTestTestfileInstall.cmake @@ -17,6 +17,17 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# Define a label for base tests only: PARAVIS_BASE +# Define a label for extra tests only: PARAVIS_EXTRA +# Then calling ctest with the label PARAVIS will automatically use both PARAVIS_BASE and PARAVIS_EXTRA +MACRO(DEFINE_PARAVIS_TEST test_files name label) + FOREACH(tfile ${test_files}) + SET(TEST_NAME ${COMPONENT_NAME}_${name}_${tfile}) + ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}_${label}") + ENDFOREACH() +ENDMACRO() + SET(TEST_DIRECTORIES 2D_viewer 3D_viewer diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt index 4c1af770..c339320d 100644 --- a/test/VisuPrs/CutLines/CMakeLists.txt +++ b/test/VisuPrs/CutLines/CMakeLists.txt @@ -17,18 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 E0 F1 G0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME CUTLINES_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -42,7 +33,7 @@ IF(SALOME_PARAVIS_ALL_TEST) SET_TESTS_PROPERTIES(CUTLINES_F4 PROPERTIES TIMEOUT 5000) ENDIF() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutLines) @@ -54,3 +45,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/CutLines/CTestTestfileInstall.cmake b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake index 24a7bb1d..f26bdb28 100644 --- a/test/VisuPrs/CutLines/CTestTestfileInstall.cmake +++ b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake @@ -17,12 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_CUTLINES_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" CUTLINES BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" CUTLINES EXTRA) diff --git a/test/VisuPrs/CutLines/tests.set b/test/VisuPrs/CutLines/tests.set new file mode 100644 index 00000000..c81702b2 --- /dev/null +++ b/test/VisuPrs/CutLines/tests.set @@ -0,0 +1,44 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 E0 F1 G0) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 + E1 E2 E3 E4 E5 E6 E7 E8 E9 + F2 F3 F4 F5 F6 F8 F9 G1 G2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt index 3e7ab3d8..aa789bbd 100644 --- a/test/VisuPrs/CutPlanes/CMakeLists.txt +++ b/test/VisuPrs/CutPlanes/CMakeLists.txt @@ -17,18 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 E0 F1 G0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME CUTPLANES_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -37,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutPlanes) @@ -49,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake b/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake index 34821935..f51d3631 100644 --- a/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake +++ b/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake @@ -17,12 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_CUTPLANES_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" CUTPLANES BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" CUTPLANES EXTRA) diff --git a/test/VisuPrs/CutPlanes/tests.set b/test/VisuPrs/CutPlanes/tests.set new file mode 100644 index 00000000..c28031d7 --- /dev/null +++ b/test/VisuPrs/CutPlanes/tests.set @@ -0,0 +1,44 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 E0 F1 G0) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 B3 + E1 E2 E3 E4 E5 E6 E7 E8 E9 + F2 F3 F4 F5 F6 F8 F9 G1 G2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt index 7058456e..71b8783d 100644 --- a/test/VisuPrs/DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/DeformedShape/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 E0 F1) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME DEFORMEDSHAPE_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/DeformedShape) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake b/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake index 52d0d956..bb6609e9 100644 --- a/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake +++ b/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_DEFORMEDSHAPE_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" DEFORMEDSHAPE BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" DEFORMEDSHAPE EXTRA) diff --git a/test/VisuPrs/DeformedShape/tests.set b/test/VisuPrs/DeformedShape/tests.set new file mode 100644 index 00000000..7d086056 --- /dev/null +++ b/test/VisuPrs/DeformedShape/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 E0 F1) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 B3 B4 + E1 E2 E3 E4 E5 E6 E7 E8 E9 F2 F3 F4 F5 F6 F8 F9) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt index 71f42a89..92351165 100644 --- a/test/VisuPrs/GaussPoints/CMakeLists.txt +++ b/test/VisuPrs/GaussPoints/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A2 B0 C0) -SET(ALL_TESTS A0 A1 A3 A4 A5 A6 A7 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 - C0 C1 C2 C3 C4 C6 C7 C8 C9) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME GAUSSPOINTS_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/GaussPoints) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake b/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake index 6fe8b70c..fa9878f7 100644 --- a/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake +++ b/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A3 A4 A5 A6 A7 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 - C0 C1 C2 C3 C4 C6 C7 C8 C9) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_GAUSSPOINTS_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" GAUSSPOINTS BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" GAUSSPOINTS EXTRA) diff --git a/test/VisuPrs/GaussPoints/tests.set b/test/VisuPrs/GaussPoints/tests.set new file mode 100644 index 00000000..1a4f8ae5 --- /dev/null +++ b/test/VisuPrs/GaussPoints/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A2 B0 C0) + +SET(EXTRA_TESTS A0 A1 A3 A4 A5 A6 A7 A9 B1 B2 B3 B4 B5 B6 B7 B8 B9 + C1 C2 C3 C4 C6 C7 C8 C9) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/ImportMedField/CMakeLists.txt b/test/VisuPrs/ImportMedField/CMakeLists.txt index fdf638b1..c7768186 100644 --- a/test/VisuPrs/ImportMedField/CMakeLists.txt +++ b/test/VisuPrs/ImportMedField/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 C0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B4 B5 B6 B7 B8 B9 C0 C1 C2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME IMPORTMEDFIELD_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ImportMedField) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake b/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake index 7364f7f7..c907b98c 100644 --- a/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake +++ b/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B4 B5 B6 B7 B8 B9 C0 C1 C2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_IMPORTMEDFIELD_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" IMPORTMEDFIELD BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" IMPORTMEDFIELD EXTRA) diff --git a/test/VisuPrs/ImportMedField/tests.set b/test/VisuPrs/ImportMedField/tests.set new file mode 100644 index 00000000..91333739 --- /dev/null +++ b/test/VisuPrs/ImportMedField/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 C0) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 B4 B5 B6 B7 B8 B9 C1 C2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt index 60f392e7..a0af87ef 100755 --- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt +++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 E1 F1) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ISOSURFACES_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/IsoSurfaces) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake index 546ec0a4..eadd58a4 100644 --- a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake +++ b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_ISOSURFACES_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" ISOSURFACES BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" ISOSURFACES EXTRA) diff --git a/test/VisuPrs/IsoSurfaces/tests.set b/test/VisuPrs/IsoSurfaces/tests.set new file mode 100644 index 00000000..3d5ecccc --- /dev/null +++ b/test/VisuPrs/IsoSurfaces/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 E1 F1) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 + E0 E2 E3 E4 E5 E6 E7 E8 E9 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt index 16ecedb7..f1a2d81b 100644 --- a/test/VisuPrs/MeshPresentation/CMakeLists.txt +++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt @@ -17,19 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 E2 F2 G3 H1 I0 J0 K1 L0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G3 G4 G5 G6 G7 G8 G9 - H0 H1 H2 H3 H4 H5 H6 H7 H8 H9 I0 I1 I2 I3 I4 I5 I6 I7 I8 I9 - J0 J1 J2 J3 J4 J5 J6 J7 J8 J9 K0 K1 K2 K3 K4 K5 K6 K7 K8 K9 L0 L1) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME MESH_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -38,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/MeshPresentation) @@ -50,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake b/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake index e0de497c..821f2a5e 100644 --- a/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake +++ b/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake @@ -17,13 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G3 G4 G5 G6 G7 G8 G9 - H0 H1 H2 H3 H4 H5 H6 H7 H8 H9 I0 I1 I2 I3 I4 I5 I6 I7 I8 I9 - J0 J1 J2 J3 J4 J5 J6 J7 J8 J9 K0 K1 K2 K3 K4 K5 K6 K7 K8 K9 L0 L1) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_MESH_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" MESH BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" MESH EXTRA) diff --git a/test/VisuPrs/MeshPresentation/tests.set b/test/VisuPrs/MeshPresentation/tests.set new file mode 100644 index 00000000..cd66ac68 --- /dev/null +++ b/test/VisuPrs/MeshPresentation/tests.set @@ -0,0 +1,45 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 E2 F2 G3 H1 I0 J0 K1 L0) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 E0 E1 E3 E4 E5 E6 E7 E8 E9 + F1 F3 F4 F5 F6 F8 F9 G0 G1 G4 G5 G6 G7 G8 G9 + H0 H2 H3 H4 H5 H6 H7 H8 H9 I1 I2 I3 I4 I5 I6 I7 I8 I9 + J1 J2 J3 J4 J5 J6 J7 J8 J9 K0 K2 K3 K4 K5 K6 K7 K8 K9 L1) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt index bcb5c8f6..7631e03e 100755 --- a/test/VisuPrs/Plot3D/CMakeLists.txt +++ b/test/VisuPrs/Plot3D/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A1 B0 E0 F1 G0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME PLOT3D_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Plot3D) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake b/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake index 85446403..cab87257 100644 --- a/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake +++ b/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_PLOT3D_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" PLOT3D BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" PLOT3D EXTRA) diff --git a/test/VisuPrs/Plot3D/tests.set b/test/VisuPrs/Plot3D/tests.set new file mode 100644 index 00000000..bfb78c93 --- /dev/null +++ b/test/VisuPrs/Plot3D/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A1 B0 E0 F1 G0) + +SET(EXTRA_TESTS A0 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 E1 E2 E3 E4 E5 E6 E7 E8 E9 + F2 F3 F4 F5 F6 F8 F9 G1 G2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt index cea6ccfb..e961e718 100644 --- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt +++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A3 B0 C3) -SET(ALL_TESTS A1 A3 A4 A5 A6 A7 A8 A9 B0 B1 B4 B5 B6 B7 B8 B9 C3 C6 C7) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME SWIGSCRIPTS_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/SWIG_scripts) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake b/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake index 069b1002..1da6480b 100644 --- a/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake +++ b/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A1 A3 A4 A5 A6 A7 A8 A9 B0 B1 B4 B5 B6 B7 B8 B9 C3 C6 C7) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_SWIGSCRIPTS_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" SWIGSCRIPTS BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" SWIGSCRIPTS EXTRA) diff --git a/test/VisuPrs/SWIG_scripts/tests.set b/test/VisuPrs/SWIG_scripts/tests.set new file mode 100644 index 00000000..c8c0dbac --- /dev/null +++ b/test/VisuPrs/SWIG_scripts/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A3 B0 C3) + +SET(EXTRA_TESTS A1 A4 A5 A6 A7 A8 A9 B1 B4 B5 B6 B7 B8 B9 C6 C7) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt index 939702cc..1d8c45fd 100644 --- a/test/VisuPrs/ScalarMap/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A1 B0 E0 F3 G0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME SCALARMAP_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake b/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake index d64dca58..098a944f 100644 --- a/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake +++ b/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_SCALARMAP_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" SCALARMAP BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" SCALARMAP EXTRA) diff --git a/test/VisuPrs/ScalarMap/tests.set b/test/VisuPrs/ScalarMap/tests.set new file mode 100644 index 00000000..647a644e --- /dev/null +++ b/test/VisuPrs/ScalarMap/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A1 B0 E0 F3 G0) + +SET(EXTRA_TESTS A0 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 B3 E1 E2 E3 E4 E5 E6 E7 E8 E9 + F1 F2 F4 F5 F6 F8 F9 G1 G2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt index a76da696..72ec6e90 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0 E0 F2) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME DEFORMEDSHAPESCALARMAP_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap_On_DeformedShape) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake b/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake index cf9c1351..289c791c 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_DEFORMEDSHAPESCALARMAP_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" DEFORMEDSHAPESCALARMAP BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" DEFORMEDSHAPESCALARMAP EXTRA) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/tests.set b/test/VisuPrs/ScalarMap_On_DeformedShape/tests.set new file mode 100644 index 00000000..76918a9c --- /dev/null +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0 E0 F2) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B1 B2 B3 E1 E2 E3 E4 E5 E6 E7 E8 E9 + F1 F3 F4 F5 F6 F8) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt index e1ec48b4..9accfaa8 100644 --- a/test/VisuPrs/StreamLines/CMakeLists.txt +++ b/test/VisuPrs/StreamLines/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A1 B2 E0 F2) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9 G0) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME STREAMLINES_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/StreamLines) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake b/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake index 8b4915da..fac6fc37 100644 --- a/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake +++ b/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 - E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9 G0) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_STREAMLINES_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" STREAMLINES BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" STREAMLINES EXTRA) diff --git a/test/VisuPrs/StreamLines/tests.set b/test/VisuPrs/StreamLines/tests.set new file mode 100644 index 00000000..94be18b7 --- /dev/null +++ b/test/VisuPrs/StreamLines/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A1 B2 E0 F2) + +SET(EXTRA_TESTS A0 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 + E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F3 F4 F5 F6 F8 F9 G0) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt index f4c5cf81..24613dc9 100644 --- a/test/VisuPrs/Tables/CMakeLists.txt +++ b/test/VisuPrs/Tables/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0) -SET(ALL_TESTS A0 A2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME TABLES_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Tables) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/Tables/CTestTestfileInstall.cmake b/test/VisuPrs/Tables/CTestTestfileInstall.cmake index b7ee5790..acf20df8 100644 --- a/test/VisuPrs/Tables/CTestTestfileInstall.cmake +++ b/test/VisuPrs/Tables/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_TABLES_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" TABLES BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" TABLES EXTRA) diff --git a/test/VisuPrs/Tables/tests.set b/test/VisuPrs/Tables/tests.set new file mode 100644 index 00000000..97499bc9 --- /dev/null +++ b/test/VisuPrs/Tables/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0) + +SET(EXTRA_TESTS A2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt index 71564a00..581c338f 100644 --- a/test/VisuPrs/Vectors/CMakeLists.txt +++ b/test/VisuPrs/Vectors/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B1 E0 F1) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME VECTORS_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Vectors) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/Vectors/CTestTestfileInstall.cmake b/test/VisuPrs/Vectors/CTestTestfileInstall.cmake index 02c9113c..0eeb9fa4 100644 --- a/test/VisuPrs/Vectors/CTestTestfileInstall.cmake +++ b/test/VisuPrs/Vectors/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 - F1 F2 F3 F4 F5 F6 F8 F9) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_VECTORS_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" VECTORS BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" VECTORS EXTRA) diff --git a/test/VisuPrs/Vectors/tests.set b/test/VisuPrs/Vectors/tests.set new file mode 100644 index 00000000..ec004673 --- /dev/null +++ b/test/VisuPrs/Vectors/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B1 E0 F1) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B2 B3 E1 E2 E3 E4 E5 E6 E7 E8 E9 + F2 F3 F4 F5 F6 F8 F9) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/bugs/CMakeLists.txt b/test/VisuPrs/bugs/CMakeLists.txt index 44403460..ce467bd8 100644 --- a/test/VisuPrs/bugs/CMakeLists.txt +++ b/test/VisuPrs/bugs/CMakeLists.txt @@ -17,17 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B1 C3 E0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C5 C6 C9 - D1 D3 D6 D7 E0) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME BUGS_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -36,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/bugs) @@ -48,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/bugs/CTestTestfileInstall.cmake b/test/VisuPrs/bugs/CTestTestfileInstall.cmake index 7d4ccb8a..f7389948 100644 --- a/test/VisuPrs/bugs/CTestTestfileInstall.cmake +++ b/test/VisuPrs/bugs/CTestTestfileInstall.cmake @@ -17,11 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C5 C6 C9 - D1 D3 D6 D7 E0) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_BUGS_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" BUGS BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" BUGS EXTRA) diff --git a/test/VisuPrs/bugs/tests.set b/test/VisuPrs/bugs/tests.set new file mode 100644 index 00000000..569b5f76 --- /dev/null +++ b/test/VisuPrs/bugs/tests.set @@ -0,0 +1,43 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B1 C3 E0) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A9 C5 C6 C9 + D1 D3 D6 D7) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/dump_study/CMakeLists.txt b/test/VisuPrs/dump_study/CMakeLists.txt index 67115b6e..5720f1b8 100644 --- a/test/VisuPrs/dump_study/CMakeLists.txt +++ b/test/VisuPrs/dump_study/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A0 B0) -SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B3 B4 B5) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME DUMPSTUDY_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/dump_study) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/dump_study/CTestTestfileInstall.cmake b/test/VisuPrs/dump_study/CTestTestfileInstall.cmake index a244a334..79d0e35a 100644 --- a/test/VisuPrs/dump_study/CTestTestfileInstall.cmake +++ b/test/VisuPrs/dump_study/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 B5) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_DUMPSTUDY_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" DUMPSTUDY BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" DUMPSTUDY EXTRA) diff --git a/test/VisuPrs/dump_study/tests.set b/test/VisuPrs/dump_study/tests.set new file mode 100644 index 00000000..fa52b0d8 --- /dev/null +++ b/test/VisuPrs/dump_study/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A0 B0) + +SET(EXTRA_TESTS A1 A2 A3 A4 A5 A6 A7 A8 A9 B3 B4 B5) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/imps/CMakeLists.txt b/test/VisuPrs/imps/CMakeLists.txt index 2ff789e3..771f74bb 100644 --- a/test/VisuPrs/imps/CMakeLists.txt +++ b/test/VisuPrs/imps/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A1 B1) -SET(ALL_TESTS A1 A2 A3 A4 A6 A9 B1 B2) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME IMPS_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/imps) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/imps/CTestTestfileInstall.cmake b/test/VisuPrs/imps/CTestTestfileInstall.cmake index ce264536..acd2cd2d 100644 --- a/test/VisuPrs/imps/CTestTestfileInstall.cmake +++ b/test/VisuPrs/imps/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A1 A2 A3 A4 A6 A9 B1 B2) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_IMPS_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" IMPS BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" IMPS EXTRA) diff --git a/test/VisuPrs/imps/tests.set b/test/VisuPrs/imps/tests.set new file mode 100644 index 00000000..dd614042 --- /dev/null +++ b/test/VisuPrs/imps/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A1 B1) + +SET(EXTRA_TESTS A2 A3 A4 A6 A9 B2) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF() diff --git a/test/VisuPrs/united/CMakeLists.txt b/test/VisuPrs/united/CMakeLists.txt index 28d8d8ff..e67a9261 100644 --- a/test/VisuPrs/united/CMakeLists.txt +++ b/test/VisuPrs/united/CMakeLists.txt @@ -17,16 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(BASE_TESTS A2 B0) -SET(ALL_TESTS A1 A2 A4 A5 B0) +INCLUDE(tests.set) # For make test -IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES ${ALL_TESTS}) -ELSE() - SET(TEST_NAMES ${BASE_TESTS}) -ENDIF() - FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME UNITED_${tfile}) ADD_TEST(${TEST_NAME} ${PYTHON_EXECUTABLE} ${SALOME_TEST_DRIVER} ${TIMEOUT} @@ -35,7 +28,7 @@ FOREACH(tfile ${TEST_NAMES}) SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -# Application tests +# For salome test SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/united) @@ -47,3 +40,4 @@ ENDFOREACH() INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/test/VisuPrs/united/CTestTestfileInstall.cmake b/test/VisuPrs/united/CTestTestfileInstall.cmake index 1ebd7f83..7928cedf 100644 --- a/test/VisuPrs/united/CTestTestfileInstall.cmake +++ b/test/VisuPrs/united/CTestTestfileInstall.cmake @@ -17,10 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A1 A2 A4 A5 B0) +INCLUDE(tests.set) -FOREACH(tfile ${TEST_NAMES}) - SET(TEST_NAME ${COMPONENT_NAME}_UNITED_${tfile}) - ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") -ENDFOREACH() +DEFINE_PARAVIS_TEST("${BASE_TESTS}" UNITED BASE) +DEFINE_PARAVIS_TEST("${EXTRA_TESTS}" UNITED EXTRA) diff --git a/test/VisuPrs/united/tests.set b/test/VisuPrs/united/tests.set new file mode 100644 index 00000000..e18f793a --- /dev/null +++ b/test/VisuPrs/united/tests.set @@ -0,0 +1,42 @@ +# Copyright (C) 2016 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 +# + +# This file declares a shared set of PARAVIS tests, used by two test +# approaches: "make test" and "salome test". The former is used just after +# PARAVIS build step, the latter is used from an installed SALOME application. +# +# We here initialize some cmake variables that are used, by file inclusion, in +# CMakeLists.txt (for make test) and CTestTestfileInstall.cmake (for salome +# test). +# These variables are: BASE_TESTS, EXTRA_TESTS and ALL_TESTS. The latter is +# the joint set of base and extra tests. +# Additional variables might be defined if necessary. + +SET(BASE_TESTS A2 B0) + +SET(EXTRA_TESTS A1 A4 A5) + +SET(ALL_TESTS ${BASE_TESTS} ${EXTRA_TESTS}) + +# Variable used in ADD_TEST directive +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES ${ALL_TESTS}) +ELSE() + SET(TEST_NAMES ${BASE_TESTS}) +ENDIF()