From d0f537d225ca6d5a92853c27ff893019e62c91cd Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 18 Dec 2013 16:18:10 +0000 Subject: [PATCH] Merge from V7_3_BR branch 18/12/2013 --- CMakeLists.txt | 5 +- resources/SalomeApp.xml.in | 4 +- src/Macro/CMakeLists.txt | 4 +- src/PVGUI/PVGUI_Module_widgets.cxx | 56 +++++++--- src/PVGUI/resources/PARAVIS_msg_fr.ts | 16 +++ src/PVGUI/resources/PARAVIS_msg_ja.ts | 22 ++-- src/Plugins/CMakeLists.txt | 7 ++ src/Plugins/MedReader/IO/vtkMedDriver30.cxx | 2 +- test/CMakeLists.txt | 27 +++-- test/VisuPrs/2D_viewer/CMakeLists.txt | 16 ++- test/VisuPrs/3D_viewer/CMakeLists.txt | 27 ++--- test/VisuPrs/Animation/CMakeLists.txt | 45 ++------ test/VisuPrs/CMakeLists.txt | 8 +- test/VisuPrs/CutLines/CMakeLists.txt | 52 ++------- test/VisuPrs/CutPlanes/CMakeLists.txt | 52 ++------- test/VisuPrs/DeformedShape/CMakeLists.txt | 49 ++------- test/VisuPrs/GaussPoints/CMakeLists.txt | 44 ++------ test/VisuPrs/ImportMedField/CMakeLists.txt | 37 ++----- test/VisuPrs/IsoSurfaces/CMakeLists.txt | 50 ++------- test/VisuPrs/MeshPresentation/CMakeLists.txt | 100 ++---------------- test/VisuPrs/Plot3D/CMakeLists.txt | 50 ++------- test/VisuPrs/SWIG_scripts/CMakeLists.txt | 33 ++---- test/VisuPrs/ScalarMap/CMakeLists.txt | 51 ++------- .../ScalarMap_On_DeformedShape/CMakeLists.txt | 47 ++------ test/VisuPrs/StreamLines/CMakeLists.txt | 50 ++------- test/VisuPrs/Tables/CMakeLists.txt | 16 ++- test/VisuPrs/Util/CMakeLists.txt | 11 +- test/VisuPrs/Vectors/CMakeLists.txt | 48 ++------- test/VisuPrs/bugs/CMakeLists.txt | 39 ++----- test/VisuPrs/dump_study/CMakeLists.txt | 29 ++--- test/VisuPrs/imps/CMakeLists.txt | 22 ++-- test/VisuPrs/united/CMakeLists.txt | 19 ++-- 32 files changed, 250 insertions(+), 788 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfcee458..5c2ac47c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) @@ -220,6 +220,9 @@ ADD_SUBDIRECTORY(resources) IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) ENDIF() +IF(SALOME_BUILD_TESTS) + ADD_SUBDIRECTORY(test) +ENDIF() ADD_SUBDIRECTORY(bin) # Header configuration diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index bf04c2e3..cca00733 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -46,9 +46,9 @@
- +
- +
diff --git a/src/Macro/CMakeLists.txt b/src/Macro/CMakeLists.txt index 455de015..65106b25 100644 --- a/src/Macro/CMakeLists.txt +++ b/src/Macro/CMakeLists.txt @@ -20,5 +20,5 @@ SET(_PYFILES_TO_INSTALL modes.py ) - -INSTALL_AND_COMPILE_PYTHON_FILE("${_PYFILES_TO_INSTALL}" ${SALOME_INSTALL_SCRIPT_PYTHON}) + +INSTALL_AND_COMPILE_PYTHON_FILE("${_PYFILES_TO_INSTALL}" ${SALOME_INSTALL_SCRIPT_PYTHON}/Macro) diff --git a/src/PVGUI/PVGUI_Module_widgets.cxx b/src/PVGUI/PVGUI_Module_widgets.cxx index 455c282a..b15c923c 100644 --- a/src/PVGUI/PVGUI_Module_widgets.cxx +++ b/src/PVGUI/PVGUI_Module_widgets.cxx @@ -54,6 +54,8 @@ #include #include #include +#include +#include #include #include @@ -75,7 +77,6 @@ #include #include #include -#include class ResizeHelper : public pqPVAnimationWidget { @@ -124,15 +125,40 @@ void PVGUI_Module::setupDockWidgets() pipelineBrowserDock->setWidget(browser); myDockWidgets[pipelineBrowserDock] = true; - // Properties dock - QDockWidget* propertiesDock = new QDockWidget(tr( "TTL_OBJECT_INSPECTOR" ), desk); - propertiesDock->setObjectName("propertiesDock"); - pqPropertiesPanel* propertiesPanel = new pqPropertiesPanel(); - propertiesPanel->setObjectName("propertiesPanel"); - propertiesDock->setWidget(propertiesPanel); - desk->addDockWidget(Qt::LeftDockWidgetArea, propertiesDock); - connect( propertiesPanel, SIGNAL( helpRequested(const QString&, const QString&) ), this, SLOT( showHelpForProxy(const QString&, const QString&) ) ); - myDockWidgets[propertiesDock] = true; + //Object inspector + QDockWidget* objectInspectorDock = new QDockWidget( tr( "TTL_OBJECT_INSPECTOR" ), desk ); + objectInspectorDock->setObjectName("objectInspectorDock"); + objectInspectorDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::NoDockWidgetArea|Qt::RightDockWidgetArea ); + desk->addDockWidget( Qt::LeftDockWidgetArea, objectInspectorDock ); + + pqObjectInspectorWidget* objectInspectorWidget = new pqObjectInspectorWidget(objectInspectorDock); + objectInspectorDock->setObjectName("objectInspectorWidget"); + objectInspectorWidget->setShowOnAccept(true); + objectInspectorDock->setWidget(objectInspectorWidget); + connect( objectInspectorWidget, SIGNAL( helpRequested(const QString&, const QString&) ), this, SLOT( showHelpForProxy(const QString&, const QString&) ) ); + myDockWidgets[objectInspectorDock] = true; + + //Display Dock + QDockWidget* displayDock = new QDockWidget( tr( "TTL_DISPLAY" ), desk ); + displayDock->setObjectName("displayDock"); + QWidget* displayWidgetFrame = new QWidget(displayDock); + displayWidgetFrame->setObjectName("displayWidgetFrame"); + displayDock->setWidget(displayWidgetFrame); + + QScrollArea* displayScrollArea = new QScrollArea(displayWidgetFrame); + displayScrollArea->setObjectName("displayScrollArea"); + displayScrollArea->setWidgetResizable(true); + + QVBoxLayout* verticalLayout = new QVBoxLayout(displayWidgetFrame); + verticalLayout->setSpacing(0); + verticalLayout->setContentsMargins(0, 0, 0, 0); + + pqDisplayProxyEditorWidget* displayWidget = new pqDisplayProxyEditorWidget(displayDock); + displayWidget->setObjectName("displayWidget"); + displayScrollArea->setWidget(displayWidget); + verticalLayout->addWidget(displayScrollArea); + + myDockWidgets[displayDock] = true; // information dock QDockWidget* informationDock = new QDockWidget(tr( "TTL_INFORMATION" ), desk); @@ -157,13 +183,13 @@ void PVGUI_Module::setupDockWidgets() verticalLayout_2->addWidget(informationScrollArea); informationDock->setWidget(informationWidgetFrame); - desk->addDockWidget(Qt::LeftDockWidgetArea, informationDock); myDockWidgets[informationDock] = true; - // put 'Properties' and 'Information' widgets into tabs desk->setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); - desk->tabifyDockWidget(propertiesDock, informationDock); - propertiesDock->raise(); + desk->tabifyDockWidget(objectInspectorDock, displayDock); + desk->tabifyDockWidget(objectInspectorDock, informationDock); + objectInspectorDock->raise(); + // Statistic View QDockWidget* statisticsViewDock = new QDockWidget( tr( "TTL_STATISTICS_VIEW" ), desk ); @@ -214,9 +240,11 @@ void PVGUI_Module::setupDockWidgets() // Memory inspector dock QDockWidget* memoryInspectorDock = new QDockWidget(tr( "TTL_MEMORY_INSPECTOR" ), desk); memoryInspectorDock->setObjectName("memoryInspectorDock"); +#ifndef WIN32 pqMemoryInspectorPanel* dockWidgetContents = new pqMemoryInspectorPanel(); dockWidgetContents->setObjectName("dockWidgetContents"); memoryInspectorDock->setWidget(dockWidgetContents); +#endif desk->addDockWidget(Qt::RightDockWidgetArea, memoryInspectorDock); myDockWidgets[memoryInspectorDock] = false; // hidden by default diff --git a/src/PVGUI/resources/PARAVIS_msg_fr.ts b/src/PVGUI/resources/PARAVIS_msg_fr.ts index 7238c218..93d657b5 100644 --- a/src/PVGUI/resources/PARAVIS_msg_fr.ts +++ b/src/PVGUI/resources/PARAVIS_msg_fr.ts @@ -3,6 +3,18 @@ @default + + STB_RESTART_TRACE + Re-initialize Trace + + + TOP_RESTART_TRACE + Re-initialize Trace + + + MEN_RESTART_TRACE + Re-initialize Trace + TOP_CLEAR_ALL Effacer tout @@ -181,6 +193,10 @@ PVGUI_Module + + PREF_SHOW_COLOR_LEGEND + Show Color Legend + TTL_PIPELINE_BROWSER Navigateur des conduites diff --git a/src/PVGUI/resources/PARAVIS_msg_ja.ts b/src/PVGUI/resources/PARAVIS_msg_ja.ts index 6201b4f1..0474842c 100644 --- a/src/PVGUI/resources/PARAVIS_msg_ja.ts +++ b/src/PVGUI/resources/PARAVIS_msg_ja.ts @@ -21,7 +21,7 @@ MEN_LIGHT - レジェ + LIGHT MEN_LOAD_FILE @@ -29,11 +29,11 @@ WRN_UNKNOWN_COMMAND - 認識されないコマンド ！ + 不明なコマンド ！ BUT_OK - OK + わかりました(&O) WRN_ADD_FAILED @@ -73,7 +73,7 @@ WRN_DUMP_FAILED - スナップショット ファイルが失敗しました。 + ファイルを保存することはできません ！ WRN_LOAD_FAILED @@ -93,11 +93,11 @@ LIGHT_ROOT_TOOLTIP - 光モジュールのルート オブジェクト + LIGHTモジュール ルート オブジェクト LIGHT_LIGHT - レジェ + LIGHT MEN_SAVE_FILE @@ -121,7 +121,7 @@ TOP_ADD_LINE - 行を追加 + 行を追加します。 MEN_DEL_LINE @@ -149,7 +149,7 @@ LIGHT_LINE - 線 + Line STB_DEL_LINE @@ -173,15 +173,15 @@ MEN_RESTART_TRACE - MEN_RESTART_TRACE + トレースを再初期化します。 TOP_RESTART_TRACE - TOP_RESTART_TRACE + トレースを再初期化します。 STB_RESTART_TRACE - STB_RESTART_TRACE + トレースを再初期化します。 diff --git a/src/Plugins/CMakeLists.txt b/src/Plugins/CMakeLists.txt index 0312b37f..9a4bd3ba 100755 --- a/src/Plugins/CMakeLists.txt +++ b/src/Plugins/CMakeLists.txt @@ -19,6 +19,13 @@ INCLUDE(${PARAVIEW_USE_FILE}) +IF(WIN32) + REMOVE_DEFINITIONS(-D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0) + IF(NOT CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") + REMOVE_DEFINITIONS(-D_HAS_ITERATOR_DEBUGGING=0) + ENDIF() +ENDIF() + SET(_subdirs #Filter #ToolBar diff --git a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx index e3f86cd7..924cc856 100644 --- a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx +++ b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx @@ -463,7 +463,7 @@ void vtkMedDriver30::ReadUnstructuredGridInformation( } this->ReadNumberOfEntity(grid, MED_CELL, MED_NODAL); - this->ReadNumberOfEntity(grid, MED_CELL, MED_DESCENDING); + //this->ReadNumberOfEntity(grid, MED_CELL, MED_DESCENDING); // VSR: 29.11.2013: commented according to the issue 22327: descending connectivity is wrongly processed this->ReadNumberOfEntity(grid, MED_DESCENDING_FACE, MED_NODAL); this->ReadNumberOfEntity(grid, MED_DESCENDING_FACE, MED_DESCENDING); this->ReadNumberOfEntity(grid, MED_DESCENDING_EDGE, MED_NODAL); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4cc1f0f2..7dc45d41 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,20 +20,19 @@ ADD_SUBDIRECTORY(VisuPrs) SET(_demo_files - demo_0_med.py - demo_1_med.py - demo_2_med.py - demo_3_med.py - demo_4_med.py - demo_5_med.py - demo_6_med.py - demo_7_med.py - demo_8_med.py - demo_9_med.py - demo_10_med.py - demo_11_med.py - demo_12_med.py - demo_13_med.py + demo0.py + demo1.py + demo2.py + demo3.py + demo4.py + demo5.py + demo6.py + demo7.py + demo8.py + demo9.py + demo10.py + demo11.py + demo12.py demo_14_med.py demo_15_med.py ) diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt index 0863a480..a41f7de3 100644 --- a/test/VisuPrs/2D_viewer/CMakeLists.txt +++ b/test/VisuPrs/2D_viewer/CMakeLists.txt @@ -17,13 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A0 - A1 - ) - SET(TIMEOUT 10000) - ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 69e7300d..8bb08c12 100755 --- a/test/VisuPrs/3D_viewer/CMakeLists.txt +++ b/test/VisuPrs/3D_viewer/CMakeLists.txt @@ -17,23 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - B0 - B1 - B2 - ) - SET(TIMEOUT 10000) - ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 2cfa9fc7..3ae9fa51 100755 --- a/test/VisuPrs/Animation/CMakeLists.txt +++ b/test/VisuPrs/Animation/CMakeLists.txt @@ -17,41 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 7e48950e..65f52494 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 # -ADD_SUBDIRECTORY( +SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) + +SET(TEST_DIRECTORIES Util 2D_viewer 3D_viewer @@ -41,3 +43,7 @@ ADD_SUBDIRECTORY( 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 36f05ff2..763ba3aa 100644 --- a/test/VisuPrs/CutLines/CMakeLists.txt +++ b/test/VisuPrs/CutLines/CMakeLists.txt @@ -17,47 +17,11 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 9ee393f1..47925505 100644 --- a/test/VisuPrs/CutPlanes/CMakeLists.txt +++ b/test/VisuPrs/CutPlanes/CMakeLists.txt @@ -17,47 +17,11 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 372b17b7..b178d211 100644 --- a/test/VisuPrs/DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/DeformedShape/CMakeLists.txt @@ -17,45 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 4106a908..b741b7a9 100644 --- a/test/VisuPrs/GaussPoints/CMakeLists.txt +++ b/test/VisuPrs/GaussPoints/CMakeLists.txt @@ -17,40 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A0 - A1 - A2 - 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(TIMEOUT 10000) - ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 02242051..d7ca98e7 100644 --- a/test/VisuPrs/ImportMedField/CMakeLists.txt +++ b/test/VisuPrs/ImportMedField/CMakeLists.txt @@ -17,34 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - 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}) - SET_TESTS_PROPERTIES(IMPORTMEDFIELD_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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}) + 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 7928b98d..d280a555 100755 --- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt +++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt @@ -17,46 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 ee345647..3ab9d337 100644 --- a/test/VisuPrs/MeshPresentation/CMakeLists.txt +++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt @@ -17,97 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 b75e8749..0a220c8a 100755 --- a/test/VisuPrs/Plot3D/CMakeLists.txt +++ b/test/VisuPrs/Plot3D/CMakeLists.txt @@ -17,46 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 5163b64f..e00266a9 100644 --- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt +++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt @@ -17,30 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A1 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - B0 - B1 - B4 - B5 - B6 - B7 - B8 - B9 - C3 - C6 - C7 - ) - SET(TIMEOUT 10000) - ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 ef5ae263..e4e6bc95 100644 --- a/test/VisuPrs/ScalarMap/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap/CMakeLists.txt @@ -17,47 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 e6c320bf..41a33f54 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt @@ -17,43 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 af4fdc7a..906efa20 100644 --- a/test/VisuPrs/StreamLines/CMakeLists.txt +++ b/test/VisuPrs/StreamLines/CMakeLists.txt @@ -17,46 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 f1be315f..c5267817 100644 --- a/test/VisuPrs/Tables/CMakeLists.txt +++ b/test/VisuPrs/Tables/CMakeLists.txt @@ -17,13 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A0 - A2 - ) - SET(TIMEOUT 10000) - ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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/Util/CMakeLists.txt b/test/VisuPrs/Util/CMakeLists.txt index ccb68ec8..73c593e0 100644 --- a/test/VisuPrs/Util/CMakeLists.txt +++ b/test/VisuPrs/Util/CMakeLists.txt @@ -22,13 +22,4 @@ SET(dist_testscript_DATA paravistesthelper.py ) -FOREACH(f ${dist_testscript_DATA}) - INSTALL(FILES ${f} DESTINATION bin/salome) - - INSTALL(CODE "SET(PYTHON_FILE ${f})") - INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})") - INSTALL(CODE "SET(DEST bin/salome)") - INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})") - INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/install_and_compile_python_file.cmake) - -ENDFOREACH(f ${dist_testscript_DATA}) +SALOME_INSTALL_SCRIPTS("${dist_testscript_DATA}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt index e08cbb7c..6a6349e8 100644 --- a/test/VisuPrs/Vectors/CMakeLists.txt +++ b/test/VisuPrs/Vectors/CMakeLists.txt @@ -17,44 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) - SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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) + 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 81e00821..5f876a7e 100644 --- a/test/VisuPrs/bugs/CMakeLists.txt +++ b/test/VisuPrs/bugs/CMakeLists.txt @@ -17,35 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - 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 - ) - SET(TIMEOUT 10000) - 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}) - SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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}) + 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 9a0c7ded..86b9c159 100644 --- a/test/VisuPrs/dump_study/CMakeLists.txt +++ b/test/VisuPrs/dump_study/CMakeLists.txt @@ -17,26 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A0 - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - B0 - B1 - B3 - B4 - B5 - ) - SET(TIMEOUT 10000) - 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}) - SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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}) + 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 14a99420..995ad14a 100644 --- a/test/VisuPrs/imps/CMakeLists.txt +++ b/test/VisuPrs/imps/CMakeLists.txt @@ -17,19 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A1 - A2 - A3 - A4 - A6 - A9 - B1 - B2 - ) - SET(TIMEOUT 10000) - 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}) - SET_TESTS_PROPERTIES(IMPS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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}) + 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 ac9a7f98..797cccc4 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 # -IF (PYTHON_EXECUTABLE) - FOREACH ( tfile - A1 - A2 - A4 - A5 - B0 - ) - SET(TIMEOUT 10000) - 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}) - SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) - ENDFOREACH( tfile ) -ENDIF (PYTHON_EXECUTABLE) +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}) + 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