From 3fbdb519d980fba1f1d941007af8b4046c2a8d5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Wed, 8 Apr 2015 16:14:41 +0200 Subject: [PATCH] enable make test enable make test --- test/VisuPrs/2D_viewer/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/3D_viewer/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/Animation/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/CMakeLists.txt | 17 +++++++++++++ test/VisuPrs/CutLines/CMakeLists.txt | 23 +++++++++++++---- test/VisuPrs/CutPlanes/CMakeLists.txt | 23 +++++++++++++---- test/VisuPrs/DeformedShape/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/GaussPoints/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/ImportMedField/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/IsoSurfaces/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/MeshPresentation/CMakeLists.txt | 25 ++++++++++++++----- test/VisuPrs/Plot3D/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/SWIG_scripts/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/ScalarMap/CMakeLists.txt | 21 +++++++++++++--- .../ScalarMap_On_DeformedShape/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/StreamLines/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/Tables/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/Vectors/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/bugs/CMakeLists.txt | 21 +++++++++++++--- test/VisuPrs/dump_study/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/imps/CMakeLists.txt | 19 +++++++++++--- test/VisuPrs/united/CMakeLists.txt | 19 +++++++++++--- 22 files changed, 370 insertions(+), 80 deletions(-) diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt index 98befa3c..00cdc129 100644 --- a/test/VisuPrs/2D_viewer/CMakeLists.txt +++ b/test/VisuPrs/2D_viewer/CMakeLists.txt @@ -17,16 +17,29 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +SET(BASE_TESTS A0) +SET(ALL_TESTS A0 A1) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A0 A1) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/2D_viewer) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt index 3b1751e6..0c191869 100755 --- a/test/VisuPrs/3D_viewer/CMakeLists.txt +++ b/test/VisuPrs/3D_viewer/CMakeLists.txt @@ -17,16 +17,29 @@ # 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) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A1 B0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/3D_viewer) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt index 818eb831..7c2c1d18 100755 --- a/test/VisuPrs/Animation/CMakeLists.txt +++ b/test/VisuPrs/Animation/CMakeLists.txt @@ -17,17 +17,30 @@ # 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) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A1 B2 C0 D1 E0 F2 G0 H1) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Animation) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/CMakeLists.txt b/test/VisuPrs/CMakeLists.txt index fe59f674..cb17f4ac 100644 --- a/test/VisuPrs/CMakeLists.txt +++ b/test/VisuPrs/CMakeLists.txt @@ -17,6 +17,23 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# For make test + +SET(TIMEOUT 1000) +SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) + +IF(NOT WIN32) + # Special case for the PV_PLUGIN_PATH environment variable: + # PV_PLUGIN_PATH=VAL_1;VAL_2;...;VAL_N + # But the ';' character is used as separator between variables (PATH, LD_LIBRARY_PATH, etc...) + # So we should shield a sequence ";/" by the '\' character. + STRING(REGEX REPLACE ";/" "\\\\;/" tests_env "${tests_env}") +ENDIF(NOT WIN32) + +SET(SALOME_TEST_DRIVER "${KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py") + +# Common part + SET(TEST_DIRECTORIES Util 2D_viewer diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt index 2067d30f..1ac03051 100644 --- a/test/VisuPrs/CutLines/CMakeLists.txt +++ b/test/VisuPrs/CutLines/CMakeLists.txt @@ -17,18 +17,31 @@ # 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 F7 F8 F9 G0 G1 G2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9 G0 G1 G2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 E0 F1 G0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutLines) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt index 22ab4cf5..fb438d6b 100644 --- a/test/VisuPrs/CutPlanes/CMakeLists.txt +++ b/test/VisuPrs/CutPlanes/CMakeLists.txt @@ -17,18 +17,31 @@ # 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 F7 F8 F9 G0 G1 G2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9 G0 G1 G2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 E0 F1 G0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutPlanes) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt index 83e8b421..6ba51528 100644 --- a/test/VisuPrs/DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/DeformedShape/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8 F9) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 E0 F1) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/DeformedShape) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt index e5e0e1be..f45b6ec2 100644 --- a/test/VisuPrs/GaussPoints/CMakeLists.txt +++ b/test/VisuPrs/GaussPoints/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 C5 C6 C7 C8 C9) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 C5 C6 C7 C8 C9) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A2 B0 C0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/GaussPoints) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/ImportMedField/CMakeLists.txt b/test/VisuPrs/ImportMedField/CMakeLists.txt index 02ad291f..3a9dd576 100644 --- a/test/VisuPrs/ImportMedField/CMakeLists.txt +++ b/test/VisuPrs/ImportMedField/CMakeLists.txt @@ -17,16 +17,29 @@ # 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 B3 B4 B5 B6 B7 B8 B9 C0 C1 C2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 C0 C1 C2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 C0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ImportMedField) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt index 311979bf..1ee8e35f 100755 --- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt +++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8 F9 G0 G1 G2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9 G0 G1 G2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 E1 F1) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/IsoSurfaces) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt index 12192b83..dbd9e4c1 100644 --- a/test/VisuPrs/MeshPresentation/CMakeLists.txt +++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt @@ -17,19 +17,32 @@ # 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 F7 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) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 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) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 E2 F2 G3 H1 I0 J0 K1 L0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/MeshPresentation) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt index 0674bbc7..c8e6ad44 100755 --- a/test/VisuPrs/Plot3D/CMakeLists.txt +++ b/test/VisuPrs/Plot3D/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8 F9 G0 G1 G2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9 G0 G1 G2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A1 B0 E0 F1 G0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Plot3D) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt index 50c1c6c3..588c485a 100644 --- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt +++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt @@ -17,16 +17,29 @@ # 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) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A1 A3 A4 A5 A6 A7 A8 A9 B0 B1 B4 B5 B6 B7 B8 B9 C3 C6 C7) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A3 B0 C3) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/SWIG_scripts) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt index 59e51366..cd1158e5 100644 --- a/test/VisuPrs/ScalarMap/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8 F9 G0 G1 G2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9 G0 G1 G2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A1 B0 E0 F3 G0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt index c218a1a4..f8d88951 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0 E0 F2) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap_On_DeformedShape) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt index ea51041d..2ca5f84d 100644 --- a/test/VisuPrs/StreamLines/CMakeLists.txt +++ b/test/VisuPrs/StreamLines/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8 F9 G0) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9 G0) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A1 B2 E0 F2) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/StreamLines) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt index 495b178c..7f2d4510 100644 --- a/test/VisuPrs/Tables/CMakeLists.txt +++ b/test/VisuPrs/Tables/CMakeLists.txt @@ -17,16 +17,29 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +SET(BASE_TESTS A0) +SET(ALL_TESTS A0 A2) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A0 A2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Tables) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt index 9e7813f7..04bc4f28 100644 --- a/test/VisuPrs/Vectors/CMakeLists.txt +++ b/test/VisuPrs/Vectors/CMakeLists.txt @@ -17,17 +17,30 @@ # 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 F7 F8 F9) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - 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 F7 F8 F9) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B1 E0 F1) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Vectors) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/bugs/CMakeLists.txt b/test/VisuPrs/bugs/CMakeLists.txt index dd1c172e..e06ed1bd 100644 --- a/test/VisuPrs/bugs/CMakeLists.txt +++ b/test/VisuPrs/bugs/CMakeLists.txt @@ -17,17 +17,30 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +SET(BASE_TESTS A0 B1 C3 D0 E0) +SET(ALL_TESTS A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C4 C5 C6 C7 C8 C9 + D0 D1 D3 D5 D6 D7 E0) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C4 C5 C6 C7 C8 C9 - D0 D1 D3 D5 D6 D7 E0) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B1 C3 D0 E0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/bugs) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/dump_study/CMakeLists.txt b/test/VisuPrs/dump_study/CMakeLists.txt index bff859bb..f5316281 100644 --- a/test/VisuPrs/dump_study/CMakeLists.txt +++ b/test/VisuPrs/dump_study/CMakeLists.txt @@ -17,16 +17,29 @@ # 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 B1 B3 B4 B5) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 B5) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A0 B0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/dump_study) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/imps/CMakeLists.txt b/test/VisuPrs/imps/CMakeLists.txt index 605b8630..df3be740 100644 --- a/test/VisuPrs/imps/CMakeLists.txt +++ b/test/VisuPrs/imps/CMakeLists.txt @@ -17,16 +17,29 @@ # 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) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A1 A2 A3 A4 A6 A9 B1 B2) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A1 B1) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/imps) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() diff --git a/test/VisuPrs/united/CMakeLists.txt b/test/VisuPrs/united/CMakeLists.txt index c69dc0e2..cba8ccee 100644 --- a/test/VisuPrs/united/CMakeLists.txt +++ b/test/VisuPrs/united/CMakeLists.txt @@ -17,16 +17,29 @@ # 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) + +# For make test IF(SALOME_PARAVIS_ALL_TEST) - SET(TEST_NAMES A1 A2 A4 A5 B0) + SET(TEST_NAMES ${ALL_TESTS}) ELSE() - SET(TEST_NAMES A2 B0) + 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} + ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}") +ENDFOREACH() + # Application tests +SET(APPLICATION_TESTS ${ALL_TESTS}) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/united) -FOREACH(tfile ${TEST_NAMES}) +FOREACH(tfile ${APPLICATION_TESTS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py DESTINATION ${TEST_INSTALL_DIRECTORY}) ENDFOREACH() -- 2.39.2