Merge branch 'agr/KW-10697'

diff --git a/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake
index 00ffe4fde5713e12f68c586d0a1eb866569015b6..6065c835451ea590e7c04b48babbd3f93be82173 100644 (file)
--- a/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 SET(TEST_NAMES A0 A1)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME 2DVIEWER_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_2DVIEWER_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake
index c23a098b78438151abd562a588955fb8097bc34e..3c8e0d2bbe83fc13b8357cf9d7027120ada51f7f 100644 (file)
--- a/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 SET(TEST_NAMES A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME 3DVIEWER_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_3DVIEWER_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/Animation/CTestTestfileInstall.cmake b/test/VisuPrs/Animation/CTestTestfileInstall.cmake
index f31731e849978ebd2a934187d5892ba1d5f8bdc1..76c1150b0aa765f26fc7223632db316f3110cff4 100644 (file)
--- a/test/VisuPrs/Animation/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/Animation/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@ 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})
+  SET(TEST_NAME ${COMPONENT_NAME}_ANIMATION_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt
index 3c10e0059b8bc79e7dd641ef0feee5f9960fb93b..a57243c52e992a96123b37b623d1efa7d42098a6 100644 (file)
--- a/test/VisuPrs/CutLines/CMakeLists.txt
+++ b/test/VisuPrs/CutLines/CMakeLists.txt
@@ -25,8 +25,6 @@ SET(ALL_TESTS  A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2
 # For make test
 IF(SALOME_PARAVIS_ALL_TEST)
   SET(TEST_NAMES ${ALL_TESTS})
-  # Increase timeout for specific tests
-  SET_TESTS_PROPERTIES(CUTLINES_F4 PROPERTIES TIMEOUT 5000)
 ELSE()
   SET(TEST_NAMES ${BASE_TESTS})
 ENDIF()
@@ -39,6 +37,11 @@ FOREACH(tfile ${TEST_NAMES})
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}")
 ENDFOREACH()
 
+IF(SALOME_PARAVIS_ALL_TEST)
+  # Increase timeout for specific tests
+  SET_TESTS_PROPERTIES(CUTLINES_F4 PROPERTIES TIMEOUT 5000)
+ENDIF()
+
 # Application tests
 SET(APPLICATION_TESTS ${ALL_TESTS})
 SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs/CutLines)

diff --git a/test/VisuPrs/CutLines/CTestTestfileInstall.cmake b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake
index 900bf97c54731da3dc8bef8ce4c1153f76bc9751..45291b742479fce1463faa06015e8bf96b8ef39a 100644 (file)
--- a/test/VisuPrs/CutLines/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
 
 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)
+  F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME CUTLINES_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_CUTLINES_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake b/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake
index 5dec141cc2771a74d513d2ef061a4a90f4309515..18509e7b8aa7577ddd9fab5e3b7d1c1d8a2bc3be 100644 (file)
--- a/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
 
 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)
+  F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME CUTPLANES_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_CUTPLANES_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake b/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake
index 1ebfaf9e2eb96634899892a213a28f674305f563..dd92ce0d2bdd54fc55fdc78b5026f89f839b3392 100644 (file)
--- a/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME DEFORMEDSHAPE_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_DEFORMEDSHAPE_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake b/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake
index 2f90cd3aee5529c7c117e728ef10e0b32ee0a1f5..397693e69cd2d73ae4c4746797cd179f6ddd9e8f 100644 (file)
--- a/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  C0 C1 C2 C3 C4 C6 C7 C8 C9)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME GAUSSPOINTS_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_GAUSSPOINTS_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake b/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake
index 66375ee94a28ec06382895de521c47efc04994a6..d6c202882ddc4e8c3b83916476970da88e98a2b8 100644 (file)
--- a/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,10 +17,10 @@
 # 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)
+SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B4 B5 B6 B7 B8 B9 C0 C1 C2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME IMPORTMEDFIELD_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_IMPORTMEDFIELD_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake
index 6e34a2a15c53f95750bed76695288acf275556c7..872cf89b3ab6ff27870f962ef8abba371817d2b0 100644 (file)
--- a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@ 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})
+  SET(TEST_NAME ${COMPONENT_NAME}_ISOSURFACES_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake b/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake
index 54bfd9bee3375af5817314f501ecad4e5a53fc4d..299bd6018c9cfc802ec4e6f5e2c37b8f24f44d12 100644 (file)
--- a/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,12 +18,12 @@
 #
 
 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
+  F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G3 G4 G5 G6 G7 G8 G9
   H0 H1 H2 H3 H4 H5 H6 H7 H8 H9 I0 I1 I2 I3 I4 I5 I6 I7 I8 I9
   J0 J1 J2 J3 J4 J5 J6 J7 J8 J9 K0 K1 K2 K3 K4 K5 K6 K7 K8 K9 L0 L1)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME MESH_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_MESH_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake b/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake
index d8854e26e2cd0fdc226b6a8af9563ab60b940b18..ab3ef791ebd0cabe0bb702a73fda2e2944755ff8 100644 (file)
--- a/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/Plot3D/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME PLOT3D_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_PLOT3D_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake b/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake
index c464f337a492442cf86602acef9ed92bacebfdf9..b180af0845b9757473acfe79525eb2c2fc03fdf3 100644 (file)
--- a/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 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})
+  SET(TEST_NAME ${COMPONENT_NAME}_SWIGSCRIPTS_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake b/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake
index dd62a34c8b73684b225163de85d6b9c2e874a3e7..c3dbbe1b9bd8e466ea153dd525d7c109b70339da 100644 (file)
--- a/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  F1 F2 F3 F4 F5 F6 F8 F9 G0 G1 G2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME SCALARMAP_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_SCALARMAP_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake b/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake
index 41d7901659243e01c5d2a59c422e9a26675b18b5..7dbad717b5081a76e7cde247d6a56927ab657502 100644 (file)
--- a/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  F1 F2 F3 F4 F5 F6 F8)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME DEFORMEDSHAPESCALARMAP_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_DEFORMEDSHAPESCALARMAP_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake b/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake
index 7401f9f3ff2fc62707c9f93a69a3e4bd859d1d45..4bcf685f08e29116d64b7e7270af9bde7e779a7f 100644 (file)
--- a/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/StreamLines/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F8 F9 G0)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME STREAMLINES_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_STREAMLINES_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/Tables/CTestTestfileInstall.cmake b/test/VisuPrs/Tables/CTestTestfileInstall.cmake
index cf350d9cce4f61f0c9d32804e2a9ad9832a96254..5d8f22297282ff61addd9548d0c4e90cfac5bcb1 100644 (file)
--- a/test/VisuPrs/Tables/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/Tables/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 SET(TEST_NAMES A0 A2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME TABLES_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_TABLES_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/Vectors/CTestTestfileInstall.cmake b/test/VisuPrs/Vectors/CTestTestfileInstall.cmake
index bfa5418ec032b1b9212ed91f5d66384e6b84de3d..f993a1f4db4b52af1aac54fb8b616369d4b3b5d2 100644 (file)
--- a/test/VisuPrs/Vectors/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/Vectors/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,10 @@
 #
 
 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)
+  F1 F2 F3 F4 F5 F6 F8 F9)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME VECTORS_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_VECTORS_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/bugs/CTestTestfileInstall.cmake b/test/VisuPrs/bugs/CTestTestfileInstall.cmake
index 7c7a5703056a43939a6615ea0a8ce9894ac49d47..9fe60f125cc026cb9bb9e2d7441fb2208632c7f0 100644 (file)
--- a/test/VisuPrs/bugs/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/bugs/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,11 +17,11 @@
 # 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)
+SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C5 C6 C8 C9
+  D1 D3 D5 D6 D7 E0)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME BUGS_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_BUGS_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/dump_study/CTestTestfileInstall.cmake b/test/VisuPrs/dump_study/CTestTestfileInstall.cmake
index e2b183ce8d004d2674668417ba3aa024036affb4..28ec6b7aaba8be18e044cdf3756ade2c49fb075c 100644 (file)
--- a/test/VisuPrs/dump_study/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/dump_study/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 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})
+  SET(TEST_NAME ${COMPONENT_NAME}_DUMPSTUDY_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/imps/CTestTestfileInstall.cmake b/test/VisuPrs/imps/CTestTestfileInstall.cmake
index b0dcadd674e3f003fa6b0274563c55e7717e62c1..9e3b6436c6076b75e57e44b8958577c691e6f71f 100644 (file)
--- a/test/VisuPrs/imps/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/imps/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 SET(TEST_NAMES A1 A2 A3 A4 A6 A9 B1 B2)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME IMPS_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_IMPS_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()

diff --git a/test/VisuPrs/united/CTestTestfileInstall.cmake b/test/VisuPrs/united/CTestTestfileInstall.cmake
index 3f7f04ad0faf6b70d45bc46b21afc68ad2cfdf10..0e85b1f032a1a6615e4cd2f19fb096851f5a5aa8 100644 (file)
--- a/test/VisuPrs/united/CTestTestfileInstall.cmake
+++ b/test/VisuPrs/united/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 SET(TEST_NAMES A1 A2 A4 A5 B0)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME UNITED_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_UNITED_${tfile})
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()