From 7f6b6b47c94b937bf2f87c286f5bd428e7c32b5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Wed, 23 Mar 2016 17:29:55 +0100 Subject: [PATCH] Prefix test names with component name + update test base according to 4219a9 and 666cd8 --- test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/Animation/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/CutLines/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/Plot3D/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake | 6 +++--- .../ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/StreamLines/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/Tables/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/Vectors/CTestTestfileInstall.cmake | 6 +++--- test/VisuPrs/bugs/CTestTestfileInstall.cmake | 8 ++++---- test/VisuPrs/dump_study/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/imps/CTestTestfileInstall.cmake | 4 ++-- test/VisuPrs/united/CTestTestfileInstall.cmake | 4 ++-- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake b/test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake index 00ffe4fd..6065c835 100644 --- 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 c23a098b..3c8e0d2b 100644 --- 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 f31731e8..76c1150b 100644 --- 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/CTestTestfileInstall.cmake b/test/VisuPrs/CutLines/CTestTestfileInstall.cmake index 900bf97c..45291b74 100644 --- 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 5dec141c..18509e7b 100644 --- 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 1ebfaf9e..dd92ce0d 100644 --- 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 2f90cd3a..397693e6 100644 --- 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 66375ee9..d6c20288 100644 --- 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 6e34a2a1..872cf89b 100644 --- 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 54bfd9be..299bd601 100644 --- 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 d8854e26..ab3ef791 100644 --- 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 c464f337..b180af08 100644 --- 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 dd62a34c..c3dbbe1b 100644 --- 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 41d79016..7dbad717 100644 --- 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 7401f9f3..4bcf685f 100644 --- 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 cf350d9c..5d8f2229 100644 --- 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 bfa5418e..f993a1f4 100644 --- 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 7c7a5703..9fe60f12 100644 --- 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 e2b183ce..28ec6b7a 100644 --- 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 b0dcadd6..9e3b6436 100644 --- 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 3f7f04ad..0e85b1f0 100644 --- 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() -- 2.39.2