From: Augustin Degomme Date: Wed, 24 Jul 2019 21:38:33 +0000 (+0200) Subject: activate some C/Fortran tests X-Git-Tag: v3.24~258 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/52db84398d011308543dd3bdae34c8a44852ecfe activate some C/Fortran tests --- diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index 84ac36f620..ad9c15820c 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -7,15 +7,19 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../include/") -# add_executable(allocmemf EXCLUDE_FROM_ALL allocmemf.f) -# add_executable(c2f2cf EXCLUDE_FROM_ALL c2f2cf.f c2f2c.c) -# add_executable(ctypesinf EXCLUDE_FROM_ALL ctypesinf.f ctypesfromc.c) -# add_dependencies(tests allocmemf c2f2cf ctypesinf) - -# target_link_libraries(allocmemf simgrid mtest_f77) -# target_link_libraries(c2f2cf simgrid mtest_f77) -# target_link_libraries(ctypesinf simgrid mtest_f77) + # add_executable(allocmemf EXCLUDE_FROM_ALL allocmemf.f) + add_executable(c2fmult EXCLUDE_FROM_ALL c2fmult.c) + add_executable(c2f2cf EXCLUDE_FROM_ALL c2f2cf.f c2f2c.c) + #add_executable(ctypesinf EXCLUDE_FROM_ALL ctypesinf.f ctypesfromc.c) + add_dependencies(tests c2f2cf c2fmult + #ctypesinf allocmemf + ) + # target_link_libraries(allocmemf simgrid mtest_f77) + target_link_libraries(c2fmult simgrid mtest_c) + target_link_libraries(c2f2cf simgrid mtest_f77) + #target_link_libraries(ctypesinf simgrid mtest_f77) endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f77/ext/c2f2cf.f b/teshsuite/smpi/mpich3-test/f77/ext/c2f2cf.f index 175592572d..89850c1307 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/c2f2cf.f +++ b/teshsuite/smpi/mpich3-test/f77/ext/c2f2cf.f @@ -41,7 +41,7 @@ C Test passing a Fortran MPI object to C errs = errs + c2frequest( req ) call mpi_wait( req, MPI_STATUS_IGNORE, ierr ) - errs = errs + c2ferrhandler( MPI_ERRORS_RETURN ) + !errs = errs + c2ferrhandler( MPI_ERRORS_RETURN ) errs = errs + c2fop( MPI_SUM ) diff --git a/teshsuite/smpi/mpich3-test/f77/ext/testlist b/teshsuite/smpi/mpich3-test/f77/ext/testlist index 745768e0cb..fd7fada1be 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/testlist +++ b/teshsuite/smpi/mpich3-test/f77/ext/testlist @@ -1,4 +1,4 @@ -#c2f2cf 1 -#c2fmult 1 +c2f2cf 1 +c2fmult 1 #ctypesinf 1