From 95dc805fa1b8b94ef0c8509b0a597ae7aee13903 Mon Sep 17 00:00:00 2001 From: DUC ANH HOANG Date: Fri, 15 Jan 2021 18:11:02 +0100 Subject: [PATCH] activate paramedmem test with "salome test" mechanism --- src/CMakeLists.txt | 6 +- ...ll.cmake => CTestTestfileInstall.cmake.in} | 9 ++- src/ParaMEDMEMTest/CMakeLists.txt | 9 +++ .../CTestTestfileInstall.cmake.in | 58 +++++++++++++++++++ 4 files changed, 76 insertions(+), 6 deletions(-) rename src/{CTestTestfileInstall.cmake => CTestTestfileInstall.cmake.in} (89%) create mode 100644 src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebae2bd8e..768a16751 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,6 +70,6 @@ IF(MEDCOUPLING_USE_MPI) ENDIF(MEDCOUPLING_USE_MPI) # Application tests -INSTALL(FILES CTestTestfileInstall.cmake - DESTINATION ${MEDCOUPLING_INSTALL_TESTS} - RENAME CTestTestfile.cmake) +configure_file(CTestTestfileInstall.cmake.in "CTestTestfileST.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileST.cmake DESTINATION ${MEDCOUPLING_INSTALL_TESTS} RENAME CTestTestfile.cmake) + diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake.in similarity index 89% rename from src/CTestTestfileInstall.cmake rename to src/CTestTestfileInstall.cmake.in index c50893a89..76061c75c 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake.in @@ -26,9 +26,12 @@ SUBDIRS(MEDCoupling_Swig) SUBDIRS(MEDLoader) SUBDIRS(MEDLoader_Swig) SUBDIRS(MEDPartitioner) -#SUBDIRS(ParaMEDMEM_Swig) -#SUBDIRS(ParaMEDMEMTest) + +set(MEDCOUPLING_USE_MPI_BOOL $) +if(MEDCOUPLING_USE_MPI_BOOL) + SUBDIRS(ParaMEDMEMTest) +endif() + SUBDIRS(MEDPartitioner_Swig) SUBDIRS(RENUMBER_Swig) SUBDIRS(PyWrapping) - diff --git a/src/ParaMEDMEMTest/CMakeLists.txt b/src/ParaMEDMEMTest/CMakeLists.txt index 7e65d5cbe..119dce22c 100644 --- a/src/ParaMEDMEMTest/CMakeLists.txt +++ b/src/ParaMEDMEMTest/CMakeLists.txt @@ -150,3 +150,12 @@ SET(COMMON_HEADERS_HXX MPI2Connector.hxx ) INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS}) + +# Application tests + +SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/ParaMEDMEMTest) +INSTALL(TARGETS ${TESTSParaMEDMEM} DESTINATION ${TEST_INSTALL_DIRECTORY}) + +# export MPIEXEC and _oversub_opt to CTestTestfile.cmake of salome test mechanism +CONFIGURE_FILE(CTestTestfileInstall.cmake.in "CTestTestfileST.cmake" @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileST.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} RENAME CTestTestfile.cmake) diff --git a/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in b/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in new file mode 100644 index 000000000..b860f7590 --- /dev/null +++ b/src/ParaMEDMEMTest/CTestTestfileInstall.cmake.in @@ -0,0 +1,58 @@ +# Copyright (C) 2015-2020 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(MPIEXEC @MPIEXEC@) +set(_oversub_opt @_oversub_opt@) + +SET(TEST_NAMES ParaMEDMEMTest) + +# TestParaMEDMEM + +set(tfile TestParaMEDMEM_Proc2) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} TestParaMEDMEM) + +set(tfile TestParaMEDMEM_Proc3) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 3 ${_oversub_opt} TestParaMEDMEM) + +set(tfile TestParaMEDMEM_Proc4) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} TestParaMEDMEM) + +set(tfile TestParaMEDMEM_Proc5) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 5 ${_oversub_opt} TestParaMEDMEM) + +# TestMPIAccess + +set(tfile TestMPIAccess_Proc2) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} TestMPIAccess) + +set(tfile TestMPIAccess_Proc3) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 3 ${_oversub_opt} TestMPIAccess) + +# TestMPIAccessDEC + +set(tfile TestMPIAccessDEC_Proc4) +set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile}) +add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} TestMPIAccessDEC) + -- 2.30.2