Prefix each test name with component name

diff --git a/CTestTestfileInstall.cmake.in b/CTestTestfileInstall.cmake.in
index 817d1ff9d4be45f1006b9d9cde1471011a36b9d7..9282d0a2875ef57192a8524957764cfa0b05fd56 100644 (file)
--- a/CTestTestfileInstall.cmake.in
+++ b/CTestTestfileInstall.cmake.in
@@ -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(SALOME_TEST_DRIVER "@CMAKE_INSTALL_PREFIX@/bin/salome/appliskel/salome_test_driver.py")
 
 SET(COMPONENT_NAME KERNEL)
-SET(TIMEOUT        500)
+SET(TIMEOUT        200)
 
 SET(KERNEL_TEST_LIB "@CMAKE_INSTALL_PREFIX@/@KERNEL_TEST_LIB@")
 

diff --git a/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake b/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
index 1e43e8a45f99768162beb6afec3c740eeb7ca784..bdf4b90b150aaa4dba17b4dff88c73a6af5f3f5d 100644 (file)
--- a/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/concurrentSession/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
@@ -23,7 +23,7 @@ SET(TEST_NAMES
   )
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME SALOME_CONCURRENT_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_SALOME_CONCURRENT_${tfile})
   ADD_TEST(${TEST_NAME} python ${tfile}.py)
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 ENDFOREACH()

diff --git a/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake b/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
index 205f3cf41368fc102bb8073ff4cf3610ddfe8722..3c5391727772a2a2ea1c9d4eb0ec51b718cf085d 100644 (file)
--- a/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/salomeCommand/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
@@ -23,7 +23,7 @@ SET(TEST_NAMES
   )
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME SALOME_COMMAND_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_SALOME_COMMAND_${tfile})
   ADD_TEST(${TEST_NAME} python ${tfile}.py)
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 ENDFOREACH()

diff --git a/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake b/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
index 67db531b338a5d396ca771aa09a8651a6c3f9f78..366f022dbaa4d7a0b5f2c7a2558a49cbcb14051b 100644 (file)
--- a/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/salomeInstance/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 instances)
 
 FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME SALOME_INSTANCE_${tfile})
+  SET(TEST_NAME ${COMPONENT_NAME}_SALOME_INSTANCE_${tfile})
   ADD_TEST(${TEST_NAME} python ${tfile}.py)
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 ENDFOREACH()

diff --git a/src/KernelHelpers/Test/CTestTestfileInstall.cmake b/src/KernelHelpers/Test/CTestTestfileInstall.cmake
index 73508ea16f66ec6d47fcb3da99a3e77d16acf002..9ba6010ee3a4e442bf6f6b0a8ac7307de2a202d9 100644 (file)
--- a/src/KernelHelpers/Test/CTestTestfileInstall.cmake
+++ b/src/KernelHelpers/Test/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,11 +18,12 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(KernelHelpers python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestKernelHelpers.py)
-  SET_TESTS_PROPERTIES(KernelHelpers PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
-  #                                                 TIMEOUT 500
+  SET(TEST_NAME ${COMPONENT_NAME}_KernelHelpers)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestKernelHelpers.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  #                                 TIMEOUT 500
                       )
   # /!\ DO NOT SET TIMEOUT PROPERTY IF USING ${SALOME_TEST_DRIVER}
   #     BUT PASS TIMEOUT VALUE TO THE DRIVER

diff --git a/src/Launcher/Test/CTestTestfileInstall.cmake b/src/Launcher/Test/CTestTestfileInstall.cmake
index 311467a5a6759c893a77c005fd6912d72bd868ff..e3db2b18b60f56712c5d678d1ac7943329914d4c 100644 (file)
--- a/src/Launcher/Test/CTestTestfileInstall.cmake
+++ b/src/Launcher/Test/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,8 +18,9 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(SalomeLauncher python ${SALOME_TEST_DRIVER} ${TIMEOUT} test_launcher.py)
-  SET_TESTS_PROPERTIES(SalomeLauncher PROPERTIES LABELS "${COMPONENT_NAME}"
+  SET(TEST_NAME ${COMPONENT_NAME}_Launcher)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} test_launcher.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}"
     #                                                 TIMEOUT 500
     )
   # /!\ DO NOT SET TIMEOUT PROPERTY IF USING ${SALOME_TEST_DRIVER}

diff --git a/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake b/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
index 0b92f2387d624ea5a42f5d3da14b1875ef30e73d..85a2fd7eb316346a451fc141a76f84ffd4ccc9e4 100644 (file)
--- a/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
+++ b/src/LifeCycleCORBA/Test/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,9 +18,10 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(LifeCycleCORBA python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestLifeCycleCORBA.py)
-  SET_TESTS_PROPERTIES(LifeCycleCORBA PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_LifeCycleCORBA)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestLifeCycleCORBA.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()

diff --git a/src/LifeCycleCORBA_SWIG/Test/CMakeLists.txt b/src/LifeCycleCORBA_SWIG/Test/CMakeLists.txt
index 2cf30c93414f5382412121e6301a1cf934c4d5fd..57556dd0f00f45754e9c05c9a5208886393da238 100755 (executable)
--- a/src/LifeCycleCORBA_SWIG/Test/CMakeLists.txt
+++ b/src/LifeCycleCORBA_SWIG/Test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -25,4 +25,8 @@ SET(SCRIPTS
   TestLifeCycleCORBA_SWIG.py
 )
 
-SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+SET(LOCAL_TEST_DIR ${KERNEL_TEST_DIR}/LifeCycleCORBA_SWIG)
+INSTALL(FILES ${SCRIPTS} DESTINATION ${LOCAL_TEST_DIR})
+INSTALL(FILES CTestTestfileInstall.cmake
+        DESTINATION ${LOCAL_TEST_DIR}
+        RENAME CTestTestfile.cmake)

diff --git a/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake b/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
index 311467a5a6759c893a77c005fd6912d72bd868ff..1e7257473236da1bd2871b586e44338c82494362 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
+++ b/src/LifeCycleCORBA_SWIG/Test/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,12 +17,18 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF(NOT WIN32)
-  ADD_TEST(SalomeLauncher python ${SALOME_TEST_DRIVER} ${TIMEOUT} test_launcher.py)
-  SET_TESTS_PROPERTIES(SalomeLauncher PROPERTIES LABELS "${COMPONENT_NAME}"
-    #                                                 TIMEOUT 500
-    )
-  # /!\ DO NOT SET TIMEOUT PROPERTY IF USING ${SALOME_TEST_DRIVER}
-  #     BUT PASS TIMEOUT VALUE TO THE DRIVER
+SET(TEST_NAMES
+  LifeCycleCORBA_SWIGTest
+  testresourcemanager
+  testcontainermanager
+#  TestLifeCycleCORBA_SWIG
+  )
 
+IF(NOT WIN32)
+  FOREACH(tfile ${TEST_NAMES})
+    SET(TEST_NAME ${COMPONENT_NAME}_LC_${tfile})
+    ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile}.py)
+    SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}"
+      )
+  ENDFOREACH()
 ENDIF()

diff --git a/src/LifeCycleCORBA_SWIG/Test/testcontainermanager.py b/src/LifeCycleCORBA_SWIG/Test/testcontainermanager.py
index 76363d3152ae81b85cb6afcfff3831e87352fe63..0abe231dc6489d4319bf35318c56bc5e22c404db 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/Test/testcontainermanager.py
+++ b/src/LifeCycleCORBA_SWIG/Test/testcontainermanager.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -69,6 +69,6 @@ Test with catalog :
 
 
 if __name__ == '__main__':
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestContainerManager)
-  unittest.TextTestRunner().run(suite)
-
+  #suite = unittest.TestLoader().loadTestsFromTestCase(TestContainerManager)
+  #unittest.TextTestRunner().run(suite)
+  unittest.main()

diff --git a/src/NamingService/Test/CTestTestfileInstall.cmake b/src/NamingService/Test/CTestTestfileInstall.cmake
index c13e7eafb63a1643bfa95093232b9e0703afc9a8..7ffe57fea07f06e5148e514ce8c9a64ca86b474a 100644 (file)
--- a/src/NamingService/Test/CTestTestfileInstall.cmake
+++ b/src/NamingService/Test/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,11 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(NamingService python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestNamingService.py)
-  SET_TESTS_PROPERTIES(NamingService PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_NamingService)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestNamingService.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 
 ENDIF()

diff --git a/src/SALOMEDS/Test/CTestTestfileInstall.cmake b/src/SALOMEDS/Test/CTestTestfileInstall.cmake
index 19b45454a1d1ce5674c61e9e36e3b36e5b1ae93b..0b249dfe746ab743bfb23c16d85e71a3f33ede56 100644 (file)
--- a/src/SALOMEDS/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMEDS/Test/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,9 +18,10 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(SALOMEDS python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDS.py)
-  SET_TESTS_PROPERTIES(SALOMEDS PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_SALOMEDS)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDS.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()

diff --git a/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake b/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
index 7751fdaab1f91996cd676869b34c5838c14db52a..11c94b898aea0eb424111398b5864860011bf49b 100644 (file)
--- a/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMEDSImpl/Test/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,9 +18,10 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(SALOMEDSImpl python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDSImpl.py)
-  SET_TESTS_PROPERTIES(SALOMEDSImpl PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_SALOMEDSImpl)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDSImpl.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()

diff --git a/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake b/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
index 0fcbfae3d9aabf6aaf45b3ef3cb60c93348b3369..074b9b881e0f1a65944558ae4b0659236c289245 100644 (file)
--- a/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMELocalTrace/Test/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,9 +18,10 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(SALOMELocalTrace python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMELocalTrace.py)
-  SET_TESTS_PROPERTIES(SALOMELocalTrace PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_LocalTrace)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMELocalTrace.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()

diff --git a/src/SALOMESDS/CTestTestfileInstall.cmake b/src/SALOMESDS/CTestTestfileInstall.cmake
index bb88946796a803ebc52d15fd398a8c58bd005a5c..ee7dc3714107975e7e78bf4cf3aab79cd38c1ec4 100644 (file)
--- a/src/SALOMESDS/CTestTestfileInstall.cmake
+++ b/src/SALOMESDS/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,6 +18,7 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(TestSalomeSDS python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSalomeSDS.py)
-  SET_TESTS_PROPERTIES(TestSalomeSDS PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "PYTHONPATH=${KERNEL_TEST_LIB}:$ENV{PYTHONPATH}")
+  SET(TEST_NAME ${COMPONENT_NAME}_SalomeSDS)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSalomeSDS.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" ENVIRONMENT "PYTHONPATH=${KERNEL_TEST_LIB}:$ENV{PYTHONPATH}")
 ENDIF(NOT WIN32)

diff --git a/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake b/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
index 08c3e29a7fddd7230c68f3d1fc31d0cbe94e95e2..7ee19bca3f5bac4f4f0cf34d52339dfa29f6e227 100644 (file)
--- a/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMETraceCollector/Test/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,9 +18,10 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(SALOMETraceCollector python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMETraceCollector.py)
-  SET_TESTS_PROPERTIES(SALOMETraceCollector PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_SALOMETraceCollector)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMETraceCollector.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()

diff --git a/src/UnitTests/CTestTestfileInstall.cmake b/src/UnitTests/CTestTestfileInstall.cmake
index 4aa37ee1949bed015666838d57aae8619d9d9f8a..3674efa58d71707f8c688f2e379f935fd41bb926 100644 (file)
--- a/src/UnitTests/CTestTestfileInstall.cmake
+++ b/src/UnitTests/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,11 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(UnitTests python ${SALOME_TEST_DRIVER} ${TIMEOUT} UnitTests.py)
-  SET_TESTS_PROPERTIES(UnitTests PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_UnitTests)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} UnitTests.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 
 ENDIF()

diff --git a/src/Utils/Test/CTestTestfileInstall.cmake b/src/Utils/Test/CTestTestfileInstall.cmake
index 3a06d1f1a078d5c8f77572d1d1f37ce055ea0fdc..7027a54519bfcce1bc2641a0871e8a95dfc5ab11 100644 (file)
--- a/src/Utils/Test/CTestTestfileInstall.cmake
+++ b/src/Utils/Test/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,9 +18,10 @@
 #
 
 IF(NOT WIN32)
-  ADD_TEST(Utils python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestUtils.py)
-  SET_TESTS_PROPERTIES(Utils PROPERTIES
-                             LABELS "${COMPONENT_NAME}"
-                             ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+  SET(TEST_NAME ${COMPONENT_NAME}_Utils)
+  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestUtils.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+                                    LABELS "${COMPONENT_NAME}"
+                                    ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
                       )
 ENDIF()