From: Nabil Ghodbane Date: Wed, 2 Feb 2022 15:41:18 +0000 (+0100) Subject: C3PO: filter tests if MPI X-Git-Tag: V9_9_0~198 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=17f60fd13179211636732471b4f15a431f7330b8;p=tools%2Fsat_salome.git C3PO: filter tests if MPI --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index e23448f..8d688c0 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -236,6 +236,7 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'} 'APPLICATION.products.openturns' : {tag: '1.17', base: 'no', section: 'version_1_17_FD32' } 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD32'} + 'APPLICATION.rm_products' : ['mpi4py'] } { # FD 34 qt5 package is qt5-qtbase-devel. @@ -245,5 +246,6 @@ __overwrite__ : 'APPLICATION.products.omniORBpy': '4.2.4' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'} + 'APPLICATION.rm_products' : ['mpi4py'] } ] diff --git a/products/compil_scripts/C3PO.sh b/products/compil_scripts/C3PO.sh index fca7e01..a74e9dc 100755 --- a/products/compil_scripts/C3PO.sh +++ b/products/compil_scripts/C3PO.sh @@ -26,7 +26,12 @@ export LD_LIBRARY_PATH="${MEDCOUPLING_ROOT_DIR}/lib:${LD_LIBRARY_PATH}" export PYTHONPATH="${MEDCOUPLING_ROOT_DIR}/${PYTHON_LIBDIR}:${PYTHONPATH}" export PYTHONPATH="${MEDCOUPLING_ROOT_DIR}/lib:${PYTHONPATH}" export PYTHONPATH="${MEDCOUPLING_ROOT_DIR}/bin:${PYTHONPATH}" -ctest . +if [ -n "$MPI_ROOT_DIR" ]; then + ctest . +else + # these tests use MPI... + ctest -E "Dussaix_seq|Dussaix_master_worker|Dussaix_collaborative|Listings_collaboratif" +fi if [ $? -ne 0 ] then echo "ERROR on ctest"