From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Mon, 11 Apr 2016 15:42:13 +0000 (+0200)
Subject: Fix salome tests
X-Git-Tag: V7_8_0rc2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c1c7186a4ac4e1ec9950a0e066e158e28a93a35;p=tools%2Fmedcoupling.git

Fix salome tests
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3aa18b31..0707aedc0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,7 @@ ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 IF(NOT MEDCOUPLING_MICROMED)
   # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  
+
   # RENUMBER
   IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
@@ -40,7 +40,7 @@ IF(NOT MEDCOUPLING_MICROMED)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
     ENDIF(MEDCOUPLING_ENABLE_PYTHON)
   ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
-  
+
   # MEDPartitioner
   IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
@@ -53,7 +53,7 @@ ENDIF(NOT MEDCOUPLING_MICROMED)
 IF(MEDCOUPLING_USE_MPI)
   # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
-  
+
   # ParaMEDLoader
   IF(NOT MEDCOUPLING_MICROMED)
     ADD_SUBDIRECTORY(ParaMEDLoader)
@@ -72,7 +72,3 @@ ENDIF(MEDCOUPLING_USE_MPI)
 INSTALL(FILES CTestTestfileInstall.cmake
   DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
   RENAME CTestTestfile.cmake)
-
-INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling
-  RENAME CTestTestfile.cmake)
diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake
index a1144abf6..62cc80e2e 100644
--- a/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@ -17,4 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+SET(COMPONENT_NAME MEDCOUPLING)
+SET(TIMEOUT        500)
+
+SUBDIRS(INTERP_KERNELTest)
 SUBDIRS(MEDCoupling)
+SUBDIRS(MEDCoupling_Swig)
+SUBDIRS(MEDLoader)
+SUBDIRS(MEDLoader_Swig)
+SUBDIRS(MEDPartitioner)
+#SUBDIRS(ParaMEDMEM_Swig)
+#SUBDIRS(ParaMEDMEMTest)
+SUBDIRS(MEDPartitioner_Swig)
+SUBDIRS(RENUMBER_Swig)
diff --git a/src/CTestTestfileInstallMEDCoupling.cmake b/src/CTestTestfileInstallMEDCoupling.cmake
deleted file mode 100644
index e23cd3b98..000000000
--- a/src/CTestTestfileInstallMEDCoupling.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-# 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(COMPONENT_NAME MEDCOUPLING)
-
-#SUBDIRS(INTERP_KERNELTest)
-SUBDIRS(MEDCoupling)
-#SUBDIRS(MEDCoupling_Swig)
-#SUBDIRS(MEDLoader)
-#SUBDIRS(MEDLoader/Swig)
-#SUBDIRS(MEDPartitioner)
-#SUBDIRS(ParaMEDMEM_Swig)
-#SUBDIRS(ParaMEDMEMTest)
-#SUBDIRS(MEDPartitioner_Swig)
-#SUBDIRS(RENUMBER_Swig)
diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt
index 80ce1f7c4..b63df2aca 100644
--- a/src/INTERP_KERNELTest/CMakeLists.txt
+++ b/src/INTERP_KERNELTest/CMakeLists.txt
@@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
   )
-  
+
 IF(NOT MEDCOUPLING_MICROMED)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader)
 ENDIF()
@@ -108,7 +108,7 @@ INSTALL(FILES CppUnitTest.hxx InterpKernelTestExport.hxx TestInterpKernelUtils.h
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling/INTERP_KERNELTest)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/INTERP_KERNELTest)
 INSTALL(TARGETS TestINTERP_KERNEL InterpKernelTest DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake
diff --git a/src/INTERP_KERNELTest/CTestTestfileInstall.cmake b/src/INTERP_KERNELTest/CTestTestfileInstall.cmake
index 60cb762f9..f2fd0c739 100644
--- a/src/INTERP_KERNELTest/CTestTestfileInstall.cmake
+++ b/src/INTERP_KERNELTest/CTestTestfileInstall.cmake
@@ -17,5 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(TestINTERP_KERNEL TestINTERP_KERNEL)
-SET_TESTS_PROPERTIES(TestINTERP_KERNEL PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  TestINTERP_KERNEL
+)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} ${tfile})
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/MEDCoupling/Test/CMakeLists.txt b/src/MEDCoupling/Test/CMakeLists.txt
index bd80d923d..18b54da61 100644
--- a/src/MEDCoupling/Test/CMakeLists.txt
+++ b/src/MEDCoupling/Test/CMakeLists.txt
@@ -77,7 +77,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES UnitTestsResult)
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDCoupling)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling)
 INSTALL(TARGETS TestMEDCoupling TestMEDCouplingRemapper TestMEDCouplingExamples DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake
diff --git a/src/MEDCoupling/Test/CTestTestfileInstall.cmake b/src/MEDCoupling/Test/CTestTestfileInstall.cmake
index 5ec978f73..a1a5caa3b 100644
--- a/src/MEDCoupling/Test/CTestTestfileInstall.cmake
+++ b/src/MEDCoupling/Test/CTestTestfileInstall.cmake
@@ -17,11 +17,17 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(TestMEDCoupling TestMEDCoupling)
-SET_TESTS_PROPERTIES(TestMEDCoupling PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  TestMEDCoupling
+  TestMEDCouplingRemapper
+  TestMEDCouplingExamples
+)
 
-ADD_TEST(TestMEDCouplingRemapper TestMEDCouplingRemapper)
-SET_TESTS_PROPERTIES(TestMEDCouplingRemapper PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(TestMEDCouplingExamples TestMEDCouplingExamples)
-SET_TESTS_PROPERTIES(TestMEDCouplingExamples PROPERTIES LABELS "${COMPONENT_NAME}")
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} ${tfile})
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index b3f700dae..03ee9d806 100644
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -37,23 +37,23 @@ SET (MC_pyTestFiles
     MEDCouplingBasicsTest2.py
     MEDCouplingBasicsTest3.py
     MEDCouplingBasicsTest4.py
-    MEDCouplingBasicsTest5.py 
-    MEDCouplingRemapperTest.py 
-    MEDCouplingDataForTest.py 
-    MEDCouplingNumPyTest.py 
+    MEDCouplingBasicsTest5.py
+    MEDCouplingRemapperTest.py
+    MEDCouplingDataForTest.py
+    MEDCouplingNumPyTest.py
     MEDCouplingPickleTest.py
 )
 
 SET (MC_Swig_interf
-    MEDCoupling.i 
-    MEDCouplingCommon.i 
-    MEDCouplingRefCountObject.i 
-    MEDCouplingMemArray.i 
-    MEDCouplingFieldDiscretization.i 
-    MEDCouplingTimeDiscretization.i 
-    MEDCouplingFinalize.i 
-    MEDCouplingRemapper.i 
-    MEDCouplingTypemaps.i 
+    MEDCoupling.i
+    MEDCouplingCommon.i
+    MEDCouplingRefCountObject.i
+    MEDCouplingMemArray.i
+    MEDCouplingFieldDiscretization.i
+    MEDCouplingTimeDiscretization.i
+    MEDCouplingFinalize.i
+    MEDCouplingRemapper.i
+    MEDCouplingTypemaps.i
     MEDCouplingDataArrayTypemaps.i
 )
 
@@ -140,7 +140,7 @@ ENDIF(NUMPY_FOUND)
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDCoupling_Swig)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling_Swig)
 LIST(APPEND MC_pyTestFiles MEDCouplingExamplesTest.py)
 INSTALL(FILES ${MC_pyTestFiles} DESTINATION ${TEST_INSTALL_DIRECTORY})
 
diff --git a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
index 1f21e9c02..7570b3ae5 100644
--- a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
+++ b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
@@ -17,33 +17,24 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(MEDCouplingBasicsTest1 python MEDCouplingBasicsTest1.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest1 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest2 python MEDCouplingBasicsTest2.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest2 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest3 python MEDCouplingBasicsTest3.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest3 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest4 python MEDCouplingBasicsTest4.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest4 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest5 python MEDCouplingBasicsTest5.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest5 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest python MEDCouplingBasicsTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingExamplesTest python MEDCouplingExamplesTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingExamplesTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingRemapperTest python MEDCouplingRemapperTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingRemapperTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-# if numpy is used
-ADD_TEST(MEDCouplingNumPyTest python MEDCouplingNumPyTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingNumPyTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingPickleTest python MEDCouplingPickleTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingPickleTest PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  MEDCouplingBasicsTest1
+  MEDCouplingBasicsTest2
+  MEDCouplingBasicsTest3
+  MEDCouplingBasicsTest4
+  MEDCouplingBasicsTest5
+  MEDCouplingExamplesTest
+  MEDCouplingRemapperTest
+  # if numpy is used
+  MEDCouplingNumPyTest
+  MEDCouplingPickleTest
+)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} python ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt
index 2da9ab155..ed4a1ef67 100644
--- a/src/MEDLoader/Swig/CMakeLists.txt
+++ b/src/MEDLoader/Swig/CMakeLists.txt
@@ -102,22 +102,23 @@ ENDIF(NUMPY_FOUND)
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDLoader/Swig)
-
-SET(MEDLOADER_TEST_FILES 
-    MEDLoaderDataForTest.py 
-    MEDLoaderTest1.py 
-    MEDLoaderTest2.py 
-    MEDLoaderTest3.py 
-    MEDLoaderTest4.py 
-    SauvLoaderTest.py 
-    MEDLoaderExamplesTest.py 
-    MEDLoaderCouplingTrainingSession.py 
-    CaseIO.py 
-    CaseReader.py 
-    CaseWriter.py 
-    VTKReader.py 
-    MEDLoaderSplitter.py 
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDLoader_Swig)
+
+SET(MEDLOADER_TEST_FILES
+    MEDLoaderDataForTest.py
+    MEDLoaderTest123.py
+    MEDLoaderTest1.py
+    MEDLoaderTest2.py
+    MEDLoaderTest3.py
+    MEDLoaderTest4.py
+    SauvLoaderTest.py
+    MEDLoaderExamplesTest.py
+    MEDLoaderCouplingTrainingSession.py
+    CaseIO.py
+    CaseReader.py
+    CaseWriter.py
+    VTKReader.py
+    MEDLoaderSplitter.py
     medutilities.py
 )
 
diff --git a/src/MEDLoader/Swig/CTestTestfileInstall.cmake b/src/MEDLoader/Swig/CTestTestfileInstall.cmake
index 753e2dda1..9e3da7572 100644
--- a/src/MEDLoader/Swig/CTestTestfileInstall.cmake
+++ b/src/MEDLoader/Swig/CTestTestfileInstall.cmake
@@ -17,18 +17,20 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(MEDLoaderTest1_2_3 python MEDLoaderTest123.py)
-SET_TESTS_PROPERTIES(MEDLoaderTest1_2_3 PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  MEDLoaderTest123
+  MEDLoaderTest4
+  MEDLoaderExamplesTest
+  SauvLoaderTest
+  # if numpy is used
+  MEDLoaderCouplingTrainingSession
+)
 
-ADD_TEST(MEDLoaderTest4 python MEDLoaderTest4.py)
-SET_TESTS_PROPERTIES(MEDLoaderTest4 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDLoaderExamplesTest python MEDLoaderExamplesTest.py)
-SET_TESTS_PROPERTIES(MEDLoaderExamplesTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(SauvLoaderTest python SauvLoaderTest.py)
-SET_TESTS_PROPERTIES(SauvLoaderTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-# if numpy is used
-ADD_TEST(MEDLoaderCouplingTrainingSession python MEDLoaderCouplingTrainingSession.py)
-SET_TESTS_PROPERTIES(MEDLoaderCouplingTrainingSession PROPERTIES LABELS "${COMPONENT_NAME}")
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} python ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/MEDLoader/Test/CMakeLists.txt b/src/MEDLoader/Test/CMakeLists.txt
index 613ee3880..a230e8e5f 100644
--- a/src/MEDLoader/Test/CMakeLists.txt
+++ b/src/MEDLoader/Test/CMakeLists.txt
@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNELTest # For common CppUnitTest.hxx file and TestIKUtils.hxx 
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNELTest # For common CppUnitTest.hxx file and TestIKUtils.hxx
   )
 
 SET(TestMEDLoader_SOURCES
@@ -56,7 +56,7 @@ INSTALL(TARGETS TestMEDLoader TestSauvLoader DESTINATION ${MEDCOUPLING_INSTALL_B
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDLoader)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDLoader)
 INSTALL(TARGETS TestMEDLoader TestSauvLoader DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake
diff --git a/src/MEDLoader/Test/CTestTestfileInstall.cmake b/src/MEDLoader/Test/CTestTestfileInstall.cmake
index a76c32e71..86b8027b7 100644
--- a/src/MEDLoader/Test/CTestTestfileInstall.cmake
+++ b/src/MEDLoader/Test/CTestTestfileInstall.cmake
@@ -17,8 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(TestMEDLoader TestMEDLoader)
-SET_TESTS_PROPERTIES(TestMEDLoader PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  TestMEDLoader
+  TestSauvLoader
+)
 
-ADD_TEST(TestSauvLoader TestSauvLoader)
-SET_TESTS_PROPERTIES(TestSauvLoader PROPERTIES LABELS "${COMPONENT_NAME}")
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} ${tfile})
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/MEDPartitioner/Test/CMakeLists.txt b/src/MEDPartitioner/Test/CMakeLists.txt
index 37151c482..14a9799e6 100644
--- a/src/MEDPartitioner/Test/CMakeLists.txt
+++ b/src/MEDPartitioner/Test/CMakeLists.txt
@@ -57,7 +57,7 @@ SET_TESTS_PROPERTIES(TestMEDPARTITIONER PROPERTIES ENVIRONMENT "${tests_env}")
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDPartitioner)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDPartitioner)
 INSTALL(TARGETS MEDPARTITIONERTest TestMEDPARTITIONER DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake
diff --git a/src/MEDPartitioner/Test/CTestTestfileInstall.cmake b/src/MEDPartitioner/Test/CTestTestfileInstall.cmake
index e731b98cc..46dadc4bf 100644
--- a/src/MEDPartitioner/Test/CTestTestfileInstall.cmake
+++ b/src/MEDPartitioner/Test/CTestTestfileInstall.cmake
@@ -17,5 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(TestMEDPARTITIONER TestMEDPARTITIONER)
-SET_TESTS_PROPERTIES(TestMEDPARTITIONER PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  TestMEDPARTITIONER
+)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} ${tfile})
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/MEDPartitioner_Swig/CMakeLists.txt b/src/MEDPartitioner_Swig/CMakeLists.txt
index 64d30ed91..0c622da76 100644
--- a/src/MEDPartitioner_Swig/CMakeLists.txt
+++ b/src/MEDPartitioner_Swig/CMakeLists.txt
@@ -73,7 +73,7 @@ ENDIF()
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDPartitioner_Swig)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDPartitioner_Swig)
 INSTALL(FILES MEDPartitionerTest.py DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake
diff --git a/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake b/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake
index c7f3ad294..ca5403d01 100644
--- a/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake
+++ b/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake
@@ -17,5 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(MEDPartitionerTest python MEDPartitionerTest.py)
-SET_TESTS_PROPERTIES(MEDPartitionerTest PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  MEDPartitionerTest
+)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} python ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()
diff --git a/src/RENUMBER_Swig/CMakeLists.txt b/src/RENUMBER_Swig/CMakeLists.txt
index f38377b16..ba5a680d3 100644
--- a/src/RENUMBER_Swig/CMakeLists.txt
+++ b/src/RENUMBER_Swig/CMakeLists.txt
@@ -72,7 +72,7 @@ SET_TESTS_PROPERTIES(MEDRenumberTest PROPERTIES ENVIRONMENT "${tests_env}")
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/RENUMBER_Swig)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/RENUMBER_Swig)
 INSTALL(FILES MEDRenumberTest.py DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake
diff --git a/src/RENUMBER_Swig/CTestTestfileInstall.cmake b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
index 4787e64ae..de9e3e14e 100644
--- a/src/RENUMBER_Swig/CTestTestfileInstall.cmake
+++ b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
@@ -17,5 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(MEDRenumberTest python MEDRenumberTest.py)
-SET_TESTS_PROPERTIES(MEDRenumberTest PROPERTIES LABELS "${COMPONENT_NAME}")
+SET(TEST_NAMES
+  MEDRenumberTest
+)
+
+FOREACH(tfile ${TEST_NAMES})
+  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  ADD_TEST(${TEST_NAME} python ${tfile}.py)
+  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+    LABELS "${COMPONENT_NAME}"
+    TIMEOUT ${TIMEOUT}
+    )
+ENDFOREACH()