Fix problems with `salome test`

diff --git a/src/CTestTestfileInstall.cmake.in b/src/CTestTestfileInstall.cmake.in
index 0de68c67dc82cc54199279714540dec6d86c0f4c..0004ac59490e159aa5d75975378aa2556a9ea0f9 100644 (file)
--- a/src/CTestTestfileInstall.cmake.in
+++ b/src/CTestTestfileInstall.cmake.in
@@ -19,6 +19,8 @@
 
 SET(COMPONENT_NAME MEDCOUPLING)
 SET(TIMEOUT        120)
+SET(MEDCOUPLING_BUILD_PY_TESTS $<BOOL:@MEDCOUPLING_BUILD_PY_TESTS@>)
+SET(MEDCOUPLING_USE_MPI_BOOL $<BOOL:@MEDCOUPLING_USE_MPI@>)
 
 SUBDIRS(INTERP_KERNELTest)
 SUBDIRS(MEDCoupling)
@@ -28,7 +30,6 @@ SUBDIRS(MEDLoader)
 SUBDIRS(MEDLoader_Swig)
 SUBDIRS(MEDPartitioner)
 
-set(MEDCOUPLING_USE_MPI_BOOL $<BOOL:@MEDCOUPLING_USE_MPI@>)
 if(MEDCOUPLING_USE_MPI_BOOL)
     SUBDIRS(ParaMEDMEMTest)
     SUBDIRS(ParaMEDMEM_Swig)

diff --git a/src/ICoCo/Swig/CTestTestfileInstall.cmake b/src/ICoCo/Swig/CTestTestfileInstall.cmake
index fe222f611b6cafb3a73fe56b14f41a24a4b99c41..61d1552e1d2e0d7cb11b6a09c5b1d041c9a3a0db 100644 (file)
--- a/src/ICoCo/Swig/CTestTestfileInstall.cmake
+++ b/src/ICoCo/Swig/CTestTestfileInstall.cmake
@@ -19,14 +19,13 @@
 
 IF(MEDCOUPLING_BUILD_PY_TESTS)
     INCLUDE(tests.set)
+    FOREACH(tfile ${ALL_TESTS})
+      GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
+      SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
+      ADD_TEST(${TEST_NAME} python ${tfile})
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+        LABELS "${COMPONENT_NAME}"
+        TIMEOUT ${TIMEOUT}
+        )
+    ENDFOREACH()
 ENDIF()
-
-FOREACH(tfile ${ALL_TESTS})
-  GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
-  SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
-  ADD_TEST(${TEST_NAME} python ${tfile})
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
-    LABELS "${COMPONENT_NAME}"
-    TIMEOUT ${TIMEOUT}
-    )
-ENDFOREACH()

diff --git a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
index fe222f611b6cafb3a73fe56b14f41a24a4b99c41..61d1552e1d2e0d7cb11b6a09c5b1d041c9a3a0db 100644 (file)
--- a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
+++ b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
@@ -19,14 +19,13 @@
 
 IF(MEDCOUPLING_BUILD_PY_TESTS)
     INCLUDE(tests.set)
+    FOREACH(tfile ${ALL_TESTS})
+      GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
+      SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
+      ADD_TEST(${TEST_NAME} python ${tfile})
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+        LABELS "${COMPONENT_NAME}"
+        TIMEOUT ${TIMEOUT}
+        )
+    ENDFOREACH()
 ENDIF()
-
-FOREACH(tfile ${ALL_TESTS})
-  GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
-  SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
-  ADD_TEST(${TEST_NAME} python ${tfile})
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
-    LABELS "${COMPONENT_NAME}"
-    TIMEOUT ${TIMEOUT}
-    )
-ENDFOREACH()

diff --git a/src/MEDLoader/Swig/CTestTestfileInstall.cmake b/src/MEDLoader/Swig/CTestTestfileInstall.cmake
index fe222f611b6cafb3a73fe56b14f41a24a4b99c41..61d1552e1d2e0d7cb11b6a09c5b1d041c9a3a0db 100644 (file)
--- a/src/MEDLoader/Swig/CTestTestfileInstall.cmake
+++ b/src/MEDLoader/Swig/CTestTestfileInstall.cmake
@@ -19,14 +19,13 @@
 
 IF(MEDCOUPLING_BUILD_PY_TESTS)
     INCLUDE(tests.set)
+    FOREACH(tfile ${ALL_TESTS})
+      GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
+      SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
+      ADD_TEST(${TEST_NAME} python ${tfile})
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+        LABELS "${COMPONENT_NAME}"
+        TIMEOUT ${TIMEOUT}
+        )
+    ENDFOREACH()
 ENDIF()
-
-FOREACH(tfile ${ALL_TESTS})
-  GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
-  SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
-  ADD_TEST(${TEST_NAME} python ${tfile})
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
-    LABELS "${COMPONENT_NAME}"
-    TIMEOUT ${TIMEOUT}
-    )
-ENDFOREACH()

diff --git a/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in b/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in
index 2315a4f7bb4bbb6374d0d7b80bd4fccfca3b8ef8..bbdd65e867bbda77a277ab72a17b32ebdf9c5e18 100644 (file)
--- a/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in
+++ b/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in
@@ -20,46 +20,46 @@
 set(MPIEXEC @MPIEXEC@)
 set(_oversub_opt @_oversub_opt@)
 
-SET(TEST_NAMES ParaMEDMEMTest)
+SET(TEST_PREFIX ParaMEDMEMTest)
 
 # TestParaMEDMEM
 
 set(tfile TestParaMEDMEM_Proc2)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} TestParaMEDMEM)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 set(tfile TestParaMEDMEM_Proc3)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 3 ${_oversub_opt} TestParaMEDMEM)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 set(tfile TestParaMEDMEM_Proc4)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} TestParaMEDMEM)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 set(tfile TestParaMEDMEM_Proc5)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 5 ${_oversub_opt} TestParaMEDMEM)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 # TestMPIAccess
 
 set(tfile TestMPIAccess_Proc2)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} TestMPIAccess)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 set(tfile TestMPIAccess_Proc3)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 3 ${_oversub_opt} TestMPIAccess)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 
 # TestMPIAccessDEC
 
 set(tfile TestMPIAccessDEC_Proc4)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
 add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} TestMPIAccessDEC)
 set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
 

diff --git a/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in b/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
index 38d3c04a19be6e69410a12337625eafe18287fa4..339ae323d22e0a3c545e0dde8a7e41b7b467eb01 100644 (file)
--- a/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
+++ b/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
@@ -20,37 +20,34 @@
 set(MPIEXEC @MPIEXEC@)
 set(_oversub_opt @_oversub_opt@)
 
-SET(TEST_NAMES ParaMEDMEMTest)
+SET(TEST_PREFIX ParaMEDMEMTest)
 
 # force mpiexec to use PATH env var to detect right python into mpiexec command line
 set(PATH_FOR_PYTHON $ENV{PATH})
 
 IF(MEDCOUPLING_BUILD_PY_TESTS)
-
-
     set(tfile PyPara_Basics_Proc2)
-    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
     add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_BasicOperation.py)
     set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
     
     set(tfile PyPara_InterpKernelDEC_Proc4)
-    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
     add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_InterpKernelDEC.py)
     set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
     
     set(tfile PyPara_InterpKernelDEC_Proc5)
-    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
     add_test(${TEST_NAME} ${MPIEXEC} -np 5 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_InterpKernelDEC.py)
     set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
     
     set(tfile PyPara_StructuredCoincidentDEC_Proc4)
-    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
     add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_StructuredCoincidentDEC.py)
     set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
     
     set(tfile PyPara_OverlapDEC_Proc4)
-    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_PREFIX}_${tfile})
     add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_OverlapDEC.py)
     set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
-
-ENDIF()
\ No newline at end of file
+ENDIF()

diff --git a/src/PyWrapping/CTestTestfileInstall.cmake b/src/PyWrapping/CTestTestfileInstall.cmake
index 37c275f286aade6bc8b7bcd87337c261e5217c31..3a61734b14864b1725aea9ccaa3a02e3d62c93a2 100644 (file)
--- a/src/PyWrapping/CTestTestfileInstall.cmake
+++ b/src/PyWrapping/CTestTestfileInstall.cmake
@@ -19,11 +19,14 @@
 
 IF(MEDCOUPLING_BUILD_PY_TESTS)
     INCLUDE(tests.set)
+    FOREACH(tfile ${BASE_TESTS})
+      GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
+      SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
+      ADD_TEST(${TEST_NAME} python ${tfile})
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+        LABELS "${COMPONENT_NAME}"
+        TIMEOUT ${TIMEOUT}
+        )
+    ENDFOREACH()
 ENDIF()
 
-FOREACH(tfile ${BASE_TESTS})
-  GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
-  SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
-  ADD_TEST(${TEST_NAME} python ${tfile})
-  SET_TESTS_PROPERTIES( ${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT} )
-ENDFOREACH()

diff --git a/src/RENUMBER_Swig/CTestTestfileInstall.cmake b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
index e25efe589bf1bc7ade269d3a2ccbb34a6f9d9008..73ba1f5bb846c06834fd847a60b47c0b21e15caa 100644 (file)
--- a/src/RENUMBER_Swig/CTestTestfileInstall.cmake
+++ b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
@@ -17,11 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(TEST_NAMES
-  MEDRenumberTest
-)
-
 IF(MEDCOUPLING_BUILD_PY_TESTS)
+    SET(TEST_NAMES
+      MEDRenumberTest
+      )
     FOREACH(tfile ${TEST_NAMES})
       SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
       ADD_TEST(${TEST_NAME} python ${tfile}.py)
@@ -38,5 +37,5 @@ IF(MEDCOUPLING_BUILD_PY_TESTS)
       LABELS "${COMPONENT_NAME}"
       TIMEOUT ${TIMEOUT}
       ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
-  )
+      )
 ENDIF()