From ce2e1d104f0032b1e3ee0bee53935ddeb65fe7be Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 14 Feb 2014 15:28:02 +0400 Subject: [PATCH] CMake: add option SALOME_PARAVIS_ALL_TEST which lets to select - run all SALOME PARAVIS tests or some (short test procedure) --- CMakeLists.txt | 1 + src/Plugins/MEDReader/CMakeLists.txt | 6 ++++-- test/VisuPrs/2D_viewer/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/3D_viewer/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/Animation/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/CMakeLists.txt | 4 +++- test/VisuPrs/CutLines/CMakeLists.txt | 16 +++++++++++----- test/VisuPrs/CutPlanes/CMakeLists.txt | 16 +++++++++++----- test/VisuPrs/DeformedShape/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/GaussPoints/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/ImportMedField/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/IsoSurfaces/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/MeshPresentation/CMakeLists.txt | 18 ++++++++++++------ test/VisuPrs/Plot3D/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/SWIG_scripts/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/ScalarMap/CMakeLists.txt | 14 ++++++++++---- .../ScalarMap_On_DeformedShape/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/StreamLines/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/Tables/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/Vectors/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/bugs/CMakeLists.txt | 14 ++++++++++---- test/VisuPrs/dump_study/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/imps/CMakeLists.txt | 12 +++++++++--- test/VisuPrs/united/CMakeLists.txt | 12 +++++++++--- 24 files changed, 214 insertions(+), 83 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4876ee05..fc0b2a01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,7 @@ ENDIF() # ============ OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON) OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) +OPTION(SALOME_PARAVIS_ALL_TEST "Add all tests for Salome PARAVIS module" OFF) OPTION(SALOME_PARAVIS_MINIMAL_CORBA "Build PARAVIS with a minimal CORBA interface" OFF) OPTION(SALOME_PARAVIS_BUILD_PLUGINS "Build PARAVIS plugins (MEDReader, etc ...)" ON) diff --git a/src/Plugins/MEDReader/CMakeLists.txt b/src/Plugins/MEDReader/CMakeLists.txt index 702a0937..299f1cd3 100644 --- a/src/Plugins/MEDReader/CMakeLists.txt +++ b/src/Plugins/MEDReader/CMakeLists.txt @@ -28,7 +28,6 @@ # env MED_ROOT_DIR=... cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=PATH_TO/MEDReader_INSTALL ../MEDReader_SRC -DMEDFILE_ROOT_DIR=/where/is/med-3.0.7_install PROJECT(MEDReader) -ENABLE_TESTING() CMAKE_MINIMUM_REQUIRED(VERSION 2.8) IF(COMMAND cmake_policy) @@ -100,4 +99,7 @@ IF(MEDReader_BUILD_ParaView_Plugin) ADD_SUBDIRECTORY(ParaViewPlugin) ENDIF(MEDReader_BUILD_ParaView_Plugin) -ADD_SUBDIRECTORY(Test) +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() + ADD_SUBDIRECTORY(Test) +ENDIF() diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt index a41f7de3..5037ecb4 100644 --- a/test/VisuPrs/2D_viewer/CMakeLists.txt +++ b/test/VisuPrs/2D_viewer/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A0 A1) - ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A0 A1) +ELSE() + SET(TEST_NAMES A0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt index 8bb08c12..66248e37 100755 --- a/test/VisuPrs/3D_viewer/CMakeLists.txt +++ b/test/VisuPrs/3D_viewer/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2) - ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2) +ELSE() + SET(TEST_NAMES A1 B0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt index 3ae9fa51..fd12c304 100755 --- a/test/VisuPrs/Animation/CMakeLists.txt +++ b/test/VisuPrs/Animation/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A1 B2 C0 D1 E0 F2 G0 H1) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/CMakeLists.txt b/test/VisuPrs/CMakeLists.txt index 65f52494..bb656b15 100644 --- a/test/VisuPrs/CMakeLists.txt +++ b/test/VisuPrs/CMakeLists.txt @@ -17,7 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +SET(TIMEOUT 10000) SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) +SET(PARAVIS_TEST_HELPER_FILE ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py) SET(TEST_DIRECTORIES Util @@ -43,7 +45,7 @@ SET(TEST_DIRECTORIES imps dump_study ) - + FOREACH(test_dir ${TEST_DIRECTORIES}) ADD_SUBDIRECTORY(${test_dir}) ENDFOREACH() diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt index 763ba3aa..c00a488a 100644 --- a/test/VisuPrs/CutLines/CMakeLists.txt +++ b/test/VisuPrs/CutLines/CMakeLists.txt @@ -17,11 +17,17 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A0 B0 E0 F1 G0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt index 47925505..ed2aff55 100644 --- a/test/VisuPrs/CutPlanes/CMakeLists.txt +++ b/test/VisuPrs/CutPlanes/CMakeLists.txt @@ -17,11 +17,17 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A0 B0 E0 F1 G0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt index b178d211..a80edb90 100644 --- a/test/VisuPrs/DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/DeformedShape/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A0 B0 E0 F1) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt index b741b7a9..e6d4e581 100644 --- a/test/VisuPrs/GaussPoints/CMakeLists.txt +++ b/test/VisuPrs/GaussPoints/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A2 B0 C0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/ImportMedField/CMakeLists.txt b/test/VisuPrs/ImportMedField/CMakeLists.txt index d7ca98e7..e2ac4fd8 100644 --- a/test/VisuPrs/ImportMedField/CMakeLists.txt +++ b/test/VisuPrs/ImportMedField/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 C0 C1 C2) - ADD_TEST(IMPORTMEDFIELD_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) +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) +ELSE() + SET(TEST_NAMES A0 B0 C0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(IMPORTMEDFIELD_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(IMPORTMEDFIELD_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(IMPORTMEDFIELD_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt index d280a555..3df76390 100755 --- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt +++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A0 B0 E1 F1) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt index 3ab9d337..26c1a83f 100644 --- a/test/VisuPrs/MeshPresentation/CMakeLists.txt +++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt @@ -17,12 +17,18 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A0 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) +ELSE() + SET(TEST_NAMES A0 B0 E2 F2 G3 H1 I0 J0 K1 L0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt index 0a220c8a..039ae969 100755 --- a/test/VisuPrs/Plot3D/CMakeLists.txt +++ b/test/VisuPrs/Plot3D/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A1 B0 E0 F1 G0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt index e00266a9..1c1a4542 100644 --- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt +++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A1 A3 A4 A5 A6 A7 A8 A9 B0 B1 B4 B5 B6 B7 B8 B9 C3 C6 C7) - ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A3 B0 C3) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt index e4e6bc95..fd9fd14d 100644 --- a/test/VisuPrs/ScalarMap/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A1 B0 E0 F3 G0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt index 41a33f54..939a9b3d 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A0 B0 E0 F2) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt index 906efa20..05d0ff3e 100644 --- a/test/VisuPrs/StreamLines/CMakeLists.txt +++ b/test/VisuPrs/StreamLines/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A1 B2 E0 F2) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt index c5267817..2bd84788 100644 --- a/test/VisuPrs/Tables/CMakeLists.txt +++ b/test/VisuPrs/Tables/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A0 A2) - ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A0 A2) +ELSE() + SET(TEST_NAMES A0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt index 6a6349e8..88ab5c74 100644 --- a/test/VisuPrs/Vectors/CMakeLists.txt +++ b/test/VisuPrs/Vectors/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile 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) - ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) +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) +ELSE() + SET(TEST_NAMES A0 B1 E0 F1) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/bugs/CMakeLists.txt b/test/VisuPrs/bugs/CMakeLists.txt index 5f876a7e..ab1f0f95 100644 --- a/test/VisuPrs/bugs/CMakeLists.txt +++ b/test/VisuPrs/bugs/CMakeLists.txt @@ -17,10 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH ( tfile A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C4 C5 C6 C7 C8 C9 - D0 D1 D3 D5 D6 D7 E0) - ADD_TEST(BUGS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) +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) +ELSE() + SET(TEST_NAMES A0 B1 C3 D0 E0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(BUGS_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/dump_study/CMakeLists.txt b/test/VisuPrs/dump_study/CMakeLists.txt index 86b9c159..c3e67f29 100644 --- a/test/VisuPrs/dump_study/CMakeLists.txt +++ b/test/VisuPrs/dump_study/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 B5) - ADD_TEST(DUMPSTUDY_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 B5) +ELSE() + SET(TEST_NAMES A0 B0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(DUMPSTUDY_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/imps/CMakeLists.txt b/test/VisuPrs/imps/CMakeLists.txt index 995ad14a..83698f11 100644 --- a/test/VisuPrs/imps/CMakeLists.txt +++ b/test/VisuPrs/imps/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A1 A2 A3 A4 A6 A9 B1 B2) - ADD_TEST(IMPS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A1 A2 A3 A4 A6 A9 B1 B2) +ELSE() + SET(TEST_NAMES A1 B1) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(IMPS_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(IMPS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(IMPS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() diff --git a/test/VisuPrs/united/CMakeLists.txt b/test/VisuPrs/united/CMakeLists.txt index 797cccc4..c6ee4538 100644 --- a/test/VisuPrs/united/CMakeLists.txt +++ b/test/VisuPrs/united/CMakeLists.txt @@ -17,9 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TIMEOUT 10000) -FOREACH(tfile A1 A2 A4 A5 B0) - ADD_TEST(UNITED_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) +IF(SALOME_PARAVIS_ALL_TEST) + SET(TEST_NAMES A1 A2 A4 A5 B0) +ELSE() + SET(TEST_NAMES A2 B0) +ENDIF() + +FOREACH(tfile ${TEST_NAMES}) + ADD_TEST(UNITED_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE} + ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") ENDFOREACH() -- 2.39.2