From d1948e2d379f7961605475d890c50e4d3b104ec1 Mon Sep 17 00:00:00 2001 From: abn Date: Thu, 2 Jun 2022 16:42:29 +0200 Subject: [PATCH] Disabling usage of MEDCOUPLING_BUILD_PY_TESTS at application level. + updating CTestTestfileInstall.cmake files --- src/ICoCo/Swig/CTestTestfileInstall.cmake | 4 +- .../CTestTestfileInstall.cmake | 4 +- src/MEDLoader/Swig/CTestTestfileInstall.cmake | 4 +- .../CTestTestfileInstall.cmake.in | 53 +++++++++---------- src/PyWrapping/CTestTestfileInstall.cmake | 4 +- src/RENUMBER_Swig/CTestTestfileInstall.cmake | 34 ++++++------ 6 files changed, 44 insertions(+), 59 deletions(-) diff --git a/src/ICoCo/Swig/CTestTestfileInstall.cmake b/src/ICoCo/Swig/CTestTestfileInstall.cmake index 6178f58b2..f6228fc81 100644 --- a/src/ICoCo/Swig/CTestTestfileInstall.cmake +++ b/src/ICoCo/Swig/CTestTestfileInstall.cmake @@ -17,9 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF(MEDCOUPLING_BUILD_PY_TESTS) - INCLUDE(tests.set) -ENDIF() +INCLUDE(tests.set) FOREACH(tfile ${ALL_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) diff --git a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake index 6178f58b2..f6228fc81 100644 --- a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake +++ b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake @@ -17,9 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF(MEDCOUPLING_BUILD_PY_TESTS) - INCLUDE(tests.set) -ENDIF() +INCLUDE(tests.set) FOREACH(tfile ${ALL_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) diff --git a/src/MEDLoader/Swig/CTestTestfileInstall.cmake b/src/MEDLoader/Swig/CTestTestfileInstall.cmake index 6178f58b2..f6228fc81 100644 --- a/src/MEDLoader/Swig/CTestTestfileInstall.cmake +++ b/src/MEDLoader/Swig/CTestTestfileInstall.cmake @@ -17,9 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF(MEDCOUPLING_BUILD_PY_TESTS) - INCLUDE(tests.set) -ENDIF() +INCLUDE(tests.set) FOREACH(tfile ${ALL_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) diff --git a/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in b/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in index ad4ff4ca8..3a6453750 100644 --- a/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in +++ b/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in @@ -25,32 +25,27 @@ SET(TEST_NAMES 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}) - 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}) - 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}) - 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}) - 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}) - 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 +set(tfile PyPara_Basics_Proc2) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${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}) +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}) +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}) +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}) +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}) diff --git a/src/PyWrapping/CTestTestfileInstall.cmake b/src/PyWrapping/CTestTestfileInstall.cmake index 90af88cd1..ae9192d2f 100644 --- a/src/PyWrapping/CTestTestfileInstall.cmake +++ b/src/PyWrapping/CTestTestfileInstall.cmake @@ -17,9 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF(MEDCOUPLING_BUILD_PY_TESTS) - INCLUDE(tests.set) -ENDIF() +INCLUDE(tests.set) FOREACH(tfile ${BASE_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) diff --git a/src/RENUMBER_Swig/CTestTestfileInstall.cmake b/src/RENUMBER_Swig/CTestTestfileInstall.cmake index 61ff90489..bc213d7a2 100644 --- a/src/RENUMBER_Swig/CTestTestfileInstall.cmake +++ b/src/RENUMBER_Swig/CTestTestfileInstall.cmake @@ -21,22 +21,20 @@ SET(TEST_NAMES MEDRenumberTest ) -IF(MEDCOUPLING_BUILD_PY_TESTS) - 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} - ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}" - ) - ENDFOREACH() - - SET(TEST_NAME ${COMPONENT_NAME}_RENUMBER_Swig_MEDRenumberUserGuide) - ADD_TEST(${TEST_NAME} python UsersGuideExamplesTest.py) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES - LABELS "${COMPONENT_NAME}" - TIMEOUT ${TIMEOUT} - ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}" +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} + ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}" + ) +ENDFOREACH() + +SET(TEST_NAME ${COMPONENT_NAME}_RENUMBER_Swig_MEDRenumberUserGuide) +ADD_TEST(${TEST_NAME} python UsersGuideExamplesTest.py) +SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES + LABELS "${COMPONENT_NAME}" + TIMEOUT ${TIMEOUT} + ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}" ) -ENDIF() -- 2.39.2