From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Wed, 4 Mar 2015 14:01:32 +0000 (+0100)
Subject: update to use salome test driver
X-Git-Tag: V7_6_0a1~2^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3141da4eeb56e3ce9c3ab9127019cabac7dae303;p=modules%2Fparavis.git

update to use salome test driver
---

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 738433c5..752eaa9e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,6 +36,10 @@ SET(_demo_files
   demo_14_med.py
   demo_15_med.py
   )
- 
+
 INSTALL_AND_COMPILE_PYTHON_FILE("${_demo_files}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-  
+
+# Application tests
+INSTALL(FILES CTestTestfileInstall.cmake
+  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test
+  RENAME CTestTestfile.cmake)
diff --git a/test/CTestTestfileInstall.cmake b/test/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..a07611b1
--- /dev/null
+++ b/test/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(SALOME_TEST_DRIVER "$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/appliskel/salome_test_driver.py")
+
+SET(COMPONENT_NAME PARAVIS)
+#SET(TIMEOUT        10000)
+SET(TIMEOUT        900)
+
+SUBDIRS(VisuPrs)
diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt
index 3b6f3838..98befa3c 100644
--- a/test/VisuPrs/2D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/2D_viewer/CMakeLists.txt
@@ -22,10 +22,15 @@ IF(SALOME_PARAVIS_ALL_TEST)
 ELSE()
   SET(TEST_NAMES A0)
 ENDIF()
-  
+
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/2D_viewer)
+
 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}") 
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..00ffe4fd
--- /dev/null
+++ b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A0 A1)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME 2DVIEWER_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt
index 1955e710..3b1751e6 100755
--- a/test/VisuPrs/3D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/3D_viewer/CMakeLists.txt
@@ -22,11 +22,15 @@ IF(SALOME_PARAVIS_ALL_TEST)
 ELSE()
   SET(TEST_NAMES A1 B0)
 ENDIF()
-  
+
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/3D_viewer)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
 
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..c23a098b
--- /dev/null
+++ b/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME 3DVIEWER_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt
index 6f2aace5..818eb831 100755
--- a/test/VisuPrs/Animation/CMakeLists.txt
+++ b/test/VisuPrs/Animation/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 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 
+  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()
-  
+
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Animation)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/Animation/CTestTestfileInstall.cmake b/test/VisuPrs/Animation/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..f31731e8
--- /dev/null
+++ b/test/VisuPrs/Animation/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ANIMATION_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/CMakeLists.txt b/test/VisuPrs/CMakeLists.txt
index 8c20cbda..fe59f674 100644
--- a/test/VisuPrs/CMakeLists.txt
+++ b/test/VisuPrs/CMakeLists.txt
@@ -17,20 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#SET(TIMEOUT 10000)
-SET(TIMEOUT 900)
-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(PARAVIS_TEST_HELPER_FILE ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py)
-
 SET(TEST_DIRECTORIES
   Util
   2D_viewer
@@ -59,3 +45,8 @@ SET(TEST_DIRECTORIES
 FOREACH(test_dir ${TEST_DIRECTORIES})
   ADD_SUBDIRECTORY(${test_dir})
 ENDFOREACH()
+
+# Application tests
+INSTALL(FILES CTestTestfileInstall.cmake
+  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs
+  RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/CTestTestfileInstall.cmake b/test/VisuPrs/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..b19329cc
--- /dev/null
+++ b/test/VisuPrs/CTestTestfileInstall.cmake
@@ -0,0 +1,46 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_DIRECTORIES
+  2D_viewer
+  3D_viewer
+  ScalarMap
+  DeformedShape
+  ScalarMap_On_DeformedShape
+  CutPlanes
+  CutLines
+  Vectors
+  Plot3D
+  IsoSurfaces
+  MeshPresentation
+  Animation
+  GaussPoints
+  StreamLines
+  SWIG_scripts
+  Tables
+  ImportMedField
+  united
+  bugs
+  imps
+  dump_study
+)
+
+FOREACH(test_dir ${TEST_DIRECTORIES})
+  SUBDIRS(${test_dir})
+ENDFOREACH()
diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt
index cf257b65..2067d30f 100644
--- a/test/VisuPrs/CutLines/CMakeLists.txt
+++ b/test/VisuPrs/CutLines/CMakeLists.txt
@@ -18,16 +18,21 @@
 #
 
 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 
+  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 E0 F1 G0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutLines)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/CutLines/CTestTestfileInstall.cmake b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..900bf97c
--- /dev/null
+++ b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake
@@ -0,0 +1,28 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME CUTLINES_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt
index 82303bba..22ab4cf5 100644
--- a/test/VisuPrs/CutPlanes/CMakeLists.txt
+++ b/test/VisuPrs/CutPlanes/CMakeLists.txt
@@ -18,16 +18,21 @@
 #
 
 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 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutPlanes)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake b/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..5dec141c
--- /dev/null
+++ b/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake
@@ -0,0 +1,28 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME CUTPLANES_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt
index 0a357e20..83e8b421 100644
--- a/test/VisuPrs/DeformedShape/CMakeLists.txt
+++ b/test/VisuPrs/DeformedShape/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 IF(SALOME_PARAVIS_ALL_TEST)
-  SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/DeformedShape)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake b/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..1ebfaf9e
--- /dev/null
+++ b/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME DEFORMEDSHAPE_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt
index 6f9c1c7b..e5e0e1be 100644
--- a/test/VisuPrs/GaussPoints/CMakeLists.txt
+++ b/test/VisuPrs/GaussPoints/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 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 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/GaussPoints)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake b/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..2f90cd3a
--- /dev/null
+++ b/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME GAUSSPOINTS_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/ImportMedField/CMakeLists.txt b/test/VisuPrs/ImportMedField/CMakeLists.txt
index 5e49f7de..02ad291f 100644
--- a/test/VisuPrs/ImportMedField/CMakeLists.txt
+++ b/test/VisuPrs/ImportMedField/CMakeLists.txt
@@ -23,9 +23,14 @@ ELSE()
   SET(TEST_NAMES A0 B0 C0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ImportMedField)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake b/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..66375ee9
--- /dev/null
+++ b/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME IMPORTMEDFIELD_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
index f17e8824..311979bf 100755
--- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt
+++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 IF(SALOME_PARAVIS_ALL_TEST)
-  SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/IsoSurfaces)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..6e34a2a1
--- /dev/null
+++ b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ISOSURFACES_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt
index 53b8a88f..12192b83 100644
--- a/test/VisuPrs/MeshPresentation/CMakeLists.txt
+++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt
@@ -18,28 +18,22 @@
 #
 
 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 
+  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)
 ELSE()
   SET(TEST_NAMES A0 B0 E2 F2 G3 H1 I0 J0 K1 L0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/MeshPresentation)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
 
-
-
-
-
-
-
-
-
-
-
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake b/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..54bfd9be
--- /dev/null
+++ b/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake
@@ -0,0 +1,29 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME MESH_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt
index 89ebd93a..0674bbc7 100755
--- a/test/VisuPrs/Plot3D/CMakeLists.txt
+++ b/test/VisuPrs/Plot3D/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 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 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Plot3D)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake b/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..d8854e26
--- /dev/null
+++ b/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME PLOT3D_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt
index ef133aee..50c1c6c3 100644
--- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt
+++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt
@@ -23,9 +23,14 @@ ELSE()
   SET(TEST_NAMES A3 B0 C3)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/SWIG_scripts)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake b/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..c464f337
--- /dev/null
+++ b/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A1 A3 A4 A5 A6 A7 A8 A9 B0 B1 B4 B5 B6 B7 B8 B9 C3 C6 C7)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME SWIGSCRIPTS_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt
index 1fc3f9c4..59e51366 100644
--- a/test/VisuPrs/ScalarMap/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 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 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake b/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..dd62a34c
--- /dev/null
+++ b/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME SCALARMAP_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
index ca1b75aa..c218a1a4 100644
--- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 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 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/ScalarMap_On_DeformedShape)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake b/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..41d79016
--- /dev/null
+++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME DEFORMEDSHAPESCALARMAP_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt
index cb4683bc..ea51041d 100644
--- a/test/VisuPrs/StreamLines/CMakeLists.txt
+++ b/test/VisuPrs/StreamLines/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 IF(SALOME_PARAVIS_ALL_TEST)
-  SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/StreamLines)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake b/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..7401f9f3
--- /dev/null
+++ b/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME STREAMLINES_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt
index 57ce85e0..495b178c 100644
--- a/test/VisuPrs/Tables/CMakeLists.txt
+++ b/test/VisuPrs/Tables/CMakeLists.txt
@@ -23,9 +23,14 @@ ELSE()
   SET(TEST_NAMES A0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Tables)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/Tables/CTestTestfileInstall.cmake b/test/VisuPrs/Tables/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..cf350d9c
--- /dev/null
+++ b/test/VisuPrs/Tables/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A0 A2)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME TABLES_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/Util/CMakeLists.txt b/test/VisuPrs/Util/CMakeLists.txt
index e6493538..aef54eb8 100644
--- a/test/VisuPrs/Util/CMakeLists.txt
+++ b/test/VisuPrs/Util/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 SET(dist_testscript_DATA
   paravistest.py
-  paravistesthelper.py
   )
 
 SALOME_INSTALL_SCRIPTS("${dist_testscript_DATA}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
diff --git a/test/VisuPrs/Util/paravistesthelper.py b/test/VisuPrs/Util/paravistesthelper.py
deleted file mode 100644
index de6216f5..00000000
--- a/test/VisuPrs/Util/paravistesthelper.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright (C) 2013-2015  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-import subprocess
-import sys, os
-import signal
-import killSalomeWithPort
-
-## TEMP >>> ###
-if not os.getenv("OMNIORB_USER_PATH"):
-    os.environ["OMNIORB_USER_PATH"] = os.path.realpath(os.path.expanduser('~'))
-    pass
-## <<< TEMP ###
-
-
-class SalomeSession(object):
-    def __init__(self, args=[]):
-        sys.argv = ['runSalome'] + args
-
-        if "INGUI" in args:
-            sys.argv += ["--gui"]
-            sys.argv += ["--show-desktop=1"]
-            sys.argv += ["--splash=0"]
-            #sys.argv += ["--standalone=study"]
-            #sys.argv += ["--embedded=SalomeAppEngine,cppContainer,registry,moduleCatalog"]
-        else:
-            sys.argv += ["--terminal"]
-        sys.argv += ["--modules=MED,PARAVIS,GUI"]
-
-        import setenv
-        setenv.main(True)
-
-        import runSalome
-        runSalome.runSalome()
-    pass
-#
-
-port = 0
-
-def run_test(command):
-  # Run SALOME
-  import tempfile
-  log = tempfile.NamedTemporaryFile(suffix='_nsport.log', delete=False)
-  log.close()
-  import salome
-  salome_session = SalomeSession(args=["--ns-port-log=%s"%log.name])
-  salome.salome_init()
-  session_server = salome.naming_service.Resolve('/Kernel/Session')
-  if session_server:
-      session_server.emitMessage("connect_to_study")
-      session_server.emitMessage("activate_viewer/ParaView")
-      pass
-
-  global port
-  with open(log.name) as f:
-      port = int(f.readline())
-
-  # Run test
-  #res = subprocess.check_call(command)
-  p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  _out, _err = p.communicate()
-  res = p.returncode
-
-  # Exit SALOME
-  killSalomeWithPort.killMyPort(port)
-  os.remove(log.name)
-
-  # :TRICKY: Special case of returncode=127
-  # When using paraview in SALOME environment, the following error
-  # systematically appears when exiting paraview (it's also true when using
-  # PARAVIS and exiting SALOME):
-  # Inconsistency detected by ld.so: dl-close.c: 738: _dl_close: Assertion `map->l_init_called' failed!
-  # For PARAVIS tests purpose, paraview functionalities are accessed in each
-  # test; these tests are run in the above subprocess call.
-  # The assertion error implies a subprocess return code of 127, and the test
-  # status is considered as "failed".
-  # The tricky part here is to discard such return codes, waiting for a fix
-  # maybe in paraview...
-  print "#############################"
-  print res
-  print _err
-  print "#############################"
-  if res == 127 and _err.startswith("Inconsistency detected by ld.so: dl-close.c"):
-      print "    ** THE FOLLOWING MESSAGE IS DISCARDED WHEN ANALYZING TEST SUCCESSFULNESS **"
-      print _err
-      print "    ** end of message **"
-      res = 0;
-  elif _err:
-      print "    ** Detected error **"
-      print "Error code: ", res
-      print _err
-      print "    ** end of message **"
-      pass
-
-  if _out:
-      print _out
-  return res
-#
-
-def timeout_handler(signum, frame):
-    print "FAILED : timeout(" + sys.argv[1] + ") is reached"
-    killSalomeWithPort.killMyPort(port)
-    exit(1)
-#
-signal.alarm(abs(int(sys.argv[1])-10))
-signal.signal(signal.SIGALRM, timeout_handler)
-
-res = 1
-try:
-    res = run_test([sys.executable]+sys.argv[2:])
-except:
-    #import traceback
-    #traceback.print_exc()
-    pass
-
-exit(res)
diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt
index 4c880161..9e7813f7 100644
--- a/test/VisuPrs/Vectors/CMakeLists.txt
+++ b/test/VisuPrs/Vectors/CMakeLists.txt
@@ -18,15 +18,20 @@
 #
 
 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 
+  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()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/Vectors)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/Vectors/CTestTestfileInstall.cmake b/test/VisuPrs/Vectors/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..bfa5418e
--- /dev/null
+++ b/test/VisuPrs/Vectors/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME VECTORS_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/bugs/CMakeLists.txt b/test/VisuPrs/bugs/CMakeLists.txt
index 91892594..dd1c172e 100644
--- a/test/VisuPrs/bugs/CMakeLists.txt
+++ b/test/VisuPrs/bugs/CMakeLists.txt
@@ -24,9 +24,14 @@ ELSE()
   SET(TEST_NAMES A0 B1 C3 D0 E0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/bugs)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/bugs/CTestTestfileInstall.cmake b/test/VisuPrs/bugs/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..7c7a5703
--- /dev/null
+++ b/test/VisuPrs/bugs/CTestTestfileInstall.cmake
@@ -0,0 +1,27 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(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)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME BUGS_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/dump_study/CMakeLists.txt b/test/VisuPrs/dump_study/CMakeLists.txt
index 95979907..bff859bb 100644
--- a/test/VisuPrs/dump_study/CMakeLists.txt
+++ b/test/VisuPrs/dump_study/CMakeLists.txt
@@ -23,9 +23,14 @@ ELSE()
   SET(TEST_NAMES A0 B0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/dump_study)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/dump_study/CTestTestfileInstall.cmake b/test/VisuPrs/dump_study/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..e2b183ce
--- /dev/null
+++ b/test/VisuPrs/dump_study/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 B5)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME DUMPSTUDY_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/imps/CMakeLists.txt b/test/VisuPrs/imps/CMakeLists.txt
index 57ddba2c..605b8630 100644
--- a/test/VisuPrs/imps/CMakeLists.txt
+++ b/test/VisuPrs/imps/CMakeLists.txt
@@ -23,9 +23,14 @@ ELSE()
   SET(TEST_NAMES A1 B1)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/imps)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/imps/CTestTestfileInstall.cmake b/test/VisuPrs/imps/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..b0dcadd6
--- /dev/null
+++ b/test/VisuPrs/imps/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A1 A2 A3 A4 A6 A9 B1 B2)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME IMPS_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()
diff --git a/test/VisuPrs/united/CMakeLists.txt b/test/VisuPrs/united/CMakeLists.txt
index b0cd6e19..c69dc0e2 100644
--- a/test/VisuPrs/united/CMakeLists.txt
+++ b/test/VisuPrs/united/CMakeLists.txt
@@ -23,9 +23,14 @@ ELSE()
   SET(TEST_NAMES A2 B0)
 ENDIF()
 
+# Application tests
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/united)
+
 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}")
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py
+          DESTINATION ${TEST_INSTALL_DIRECTORY})
 ENDFOREACH()
+
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${TEST_INSTALL_DIRECTORY}
+        RENAME CTestTestfile.cmake)
diff --git a/test/VisuPrs/united/CTestTestfileInstall.cmake b/test/VisuPrs/united/CTestTestfileInstall.cmake
new file mode 100644
index 00000000..3f7f04ad
--- /dev/null
+++ b/test/VisuPrs/united/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2015  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES A1 A2 A4 A5 B0)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME UNITED_${tfile})
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ENDFOREACH()