From e3ff580889f5d85e5bdb7a42bad335184bbce0ed Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 13 Jan 2019 10:58:04 +0100 Subject: [PATCH] Also add the mpich3 binaries in the dependencies of make tests + refactor several cmake files in this scary directory --- .../smpi/mpich3-test/attr/CMakeLists.txt | 3 +- .../smpi/mpich3-test/coll/CMakeLists.txt | 242 ++++-------------- .../smpi/mpich3-test/comm/CMakeLists.txt | 3 +- .../smpi/mpich3-test/datatype/CMakeLists.txt | 8 +- .../smpi/mpich3-test/f77/attr/CMakeLists.txt | 27 +- .../smpi/mpich3-test/f77/coll/CMakeLists.txt | 39 +-- .../smpi/mpich3-test/f77/comm/CMakeLists.txt | 8 +- .../mpich3-test/f77/datatype/CMakeLists.txt | 31 +-- .../smpi/mpich3-test/f77/ext/CMakeLists.txt | 7 +- .../smpi/mpich3-test/f77/info/CMakeLists.txt | 5 +- .../smpi/mpich3-test/f77/init/CMakeLists.txt | 3 +- .../smpi/mpich3-test/f77/pt2pt/CMakeLists.txt | 9 +- .../smpi/mpich3-test/f77/rma/CMakeLists.txt | 40 ++- .../smpi/mpich3-test/f77/topo/CMakeLists.txt | 13 +- .../smpi/mpich3-test/f90/coll/CMakeLists.txt | 39 +-- .../mpich3-test/f90/datatype/CMakeLists.txt | 49 +--- .../smpi/mpich3-test/f90/info/CMakeLists.txt | 9 +- .../smpi/mpich3-test/f90/init/CMakeLists.txt | 3 +- .../smpi/mpich3-test/f90/pt2pt/CMakeLists.txt | 17 +- .../smpi/mpich3-test/f90/rma/CMakeLists.txt | 40 ++- .../smpi/mpich3-test/group/CMakeLists.txt | 3 +- .../smpi/mpich3-test/info/CMakeLists.txt | 3 +- .../smpi/mpich3-test/init/CMakeLists.txt | 3 +- .../smpi/mpich3-test/perf/CMakeLists.txt | 3 +- .../smpi/mpich3-test/pt2pt/CMakeLists.txt | 3 +- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 6 +- .../smpi/mpich3-test/topo/CMakeLists.txt | 3 +- 27 files changed, 193 insertions(+), 426 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt index fdfd54b405..5d6930f37e 100644 --- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -11,7 +11,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) foreach(file attr2type attrdeleteget attrend2 attrend attrerr attrerrcomm attrerrtype attrorder attrordercomm attrordertype attrt baseattr2 baseattrcomm fkeyval fkeyvalcomm fkeyvaltype keyval_double_free) #attric - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt index 78a35e75f5..1c28008959 100644 --- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -8,203 +8,59 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") + + foreach(test allgather2 allgather3 allgather_struct + allgatherv2 allgatherv3 + allred2 allred3 allred4 allred5 allred6 allredmany + alltoall1 alltoallv0 alltoallv + # alltoallw1 alltoallw2 alltoallw_zeros + bcasttest bcastzerotype + coll2 coll3 coll4 coll5 coll6 coll7 coll8 coll9 coll10 coll11 coll12 coll13 + exscan exscan2 + gather gather2 gather_big + # iallred ibarrier icallgather icallgatherv icallreduce + # icalltoall icalltoallv icalltoallw icbarrier icbcast + # icgather icgatherv icreduce icscatter icscatterv + longuser + # nonblocking2 nonblocking3 nonblocking + # opband opbor opbxor opland oplor oplxor opmax opmaxloc + # opmin opminloc opprod opsum + op_commutative + red3 red4 redscat2 redscat3 redscatbkinter redscatblk3 + redscat red_scat_block red_scat_block2 + # redscatinter + reduce_local + scantst scatter2 scatter3 scattern scatterv + # uoplong + ) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.c) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_c) + endforeach() - add_executable(allgather2 allgather2.c) - add_executable(allgather3 allgather3.c) - add_executable(allgather_struct allgather_struct.c) - add_executable(allgatherv2 allgatherv2.c) - add_executable(allgatherv3 allgatherv3.c) - if(HAVE_PRIVATIZATION) - add_executable(allgatherv4 allgatherv4.c) - else() - add_executable(allgatherv4 allgatherv4_manual.c) - endif() - add_executable(allred2 allred2.c) - add_executable(allred3 allred3.c) - add_executable(allred4 allred4.c) - add_executable(allred5 allred5.c) - add_executable(allred6 allred6.c) - if(HAVE_PRIVATIZATION) - add_executable(allred allred.c) - else() - add_executable(allred allred_manual.c) - endif() - add_executable(allredmany allredmany.c) - add_executable(alltoall1 alltoall1.c) - add_executable(alltoallv0 alltoallv0.c) - add_executable(alltoallv alltoallv.c) -# add_executable(alltoallw1 alltoallw1.c) -# add_executable(alltoallw2 alltoallw2.c) -# add_executable(alltoallw_zeros alltoallw_zeros.c) - add_executable(bcast_full bcast.c) - add_executable(bcast_min_datatypes bcast.c) - add_executable(bcast_comm_world bcast.c) - add_executable(bcasttest bcasttest.c) - add_executable(bcastzerotype bcastzerotype.c) - add_executable(coll10 coll10.c) - add_executable(coll11 coll11.c) - add_executable(coll12 coll12.c) - add_executable(coll13 coll13.c) - add_executable(coll2 coll2.c) - add_executable(coll3 coll3.c) - add_executable(coll4 coll4.c) - add_executable(coll5 coll5.c) - add_executable(coll6 coll6.c) - add_executable(coll7 coll7.c) - add_executable(coll8 coll8.c) - add_executable(coll9 coll9.c) - add_executable(exscan2 exscan2.c) - add_executable(exscan exscan.c) - add_executable(gather2 gather2.c) - add_executable(gather_big gather_big.c) - add_executable(gather gather.c) -# add_executable(iallred iallred.c) -# add_executable(ibarrier ibarrier.c) -# add_executable(icallgather icallgather.c) -# add_executable(icallgatherv icallgatherv.c) -# add_executable(icallreduce icallreduce.c) -# add_executable(icalltoall icalltoall.c) -# add_executable(icalltoallv icalltoallv.c) -# add_executable(icalltoallw icalltoallw.c) -# add_executable(icbarrier icbarrier.c) -# add_executable(icbcast icbcast.c) -# add_executable(icgather icgather.c) -# add_executable(icgatherv icgatherv.c) -# add_executable(icreduce icreduce.c) -# add_executable(icscatter icscatter.c) -# add_executable(icscatterv icscatterv.c) - add_executable(longuser longuser.c) -# add_executable(nonblocking2 nonblocking2.c) -# add_executable(nonblocking3 nonblocking3.c) -# add_executable(nonblocking nonblocking.c) -# add_executable(opband opband.c) -# add_executable(opbor opbor.c) -# add_executable(opbxor opbxor.c) - add_executable(op_commutative op_commutative.c) -# add_executable(opland opland.c) -# add_executable(oplor oplor.c) -# add_executable(oplxor oplxor.c) -# add_executable(opmax opmax.c) -# add_executable(opmaxloc opmaxloc.c) -# add_executable(opmin opmin.c) -# add_executable(opminloc opminloc.c) -# add_executable(opprod opprod.c) -# add_executable(opsum opsum.c) - add_executable(red3 red3.c) - add_executable(red4 red4.c) - add_executable(redscat2 redscat2.c) - add_executable(redscat3 redscat3.c) - add_executable(redscatbkinter redscatbkinter.c) - add_executable(redscatblk3 redscatblk3.c) - add_executable(red_scat_block2 red_scat_block2.c) - add_executable(red_scat_block red_scat_block.c) - add_executable(redscat redscat.c) -# add_executable(redscatinter redscatinter.c) - add_executable(reduce_mpich reduce.c) - add_executable(reduce_local reduce_local.c) - add_executable(scantst scantst.c) - add_executable(scatter2 scatter2.c) - add_executable(scatter3 scatter3.c) - add_executable(scattern scattern.c) - add_executable(scatterv scatterv.c) -# add_executable(uoplong uoplong.c) - - target_link_libraries(allgather2 simgrid mtest_c) - target_link_libraries(allgather3 simgrid mtest_c) - target_link_libraries(allgather_struct simgrid mtest_c) - target_link_libraries(allgatherv2 simgrid mtest_c) - target_link_libraries(allgatherv3 simgrid mtest_c) - target_link_libraries(allgatherv4 simgrid mtest_c) - target_link_libraries(allred2 simgrid mtest_c) - target_link_libraries(allred3 simgrid mtest_c) - target_link_libraries(allred4 simgrid mtest_c) - target_link_libraries(allred5 simgrid mtest_c) - target_link_libraries(allred6 simgrid mtest_c) - target_link_libraries(allred simgrid mtest_c) - target_link_libraries(allredmany simgrid mtest_c) - target_link_libraries(alltoall1 simgrid mtest_c) - target_link_libraries(alltoallv0 simgrid mtest_c) - target_link_libraries(alltoallv simgrid mtest_c) -# target_link_libraries(alltoallw1 simgrid mtest_c) -# target_link_libraries(alltoallw2 simgrid mtest_c) -# target_link_libraries(alltoallw_zeros simgrid mtest_c) - target_link_libraries(bcast_full simgrid mtest_c) - target_link_libraries(bcast_min_datatypes simgrid mtest_c) - target_link_libraries(bcast_comm_world simgrid mtest_c) - target_link_libraries(bcasttest simgrid mtest_c) - target_link_libraries(bcastzerotype simgrid mtest_c) - target_link_libraries(coll10 simgrid mtest_c) - target_link_libraries(coll11 simgrid mtest_c) - target_link_libraries(coll12 simgrid mtest_c) - target_link_libraries(coll13 simgrid mtest_c) - target_link_libraries(coll2 simgrid mtest_c) - target_link_libraries(coll3 simgrid mtest_c) - target_link_libraries(coll4 simgrid mtest_c) - target_link_libraries(coll5 simgrid mtest_c) - target_link_libraries(coll6 simgrid mtest_c) - target_link_libraries(coll7 simgrid mtest_c) - target_link_libraries(coll8 simgrid mtest_c) - target_link_libraries(coll9 simgrid mtest_c) - target_link_libraries(exscan2 simgrid mtest_c) - target_link_libraries(exscan simgrid mtest_c) - target_link_libraries(gather2 simgrid mtest_c) - target_link_libraries(gather_big simgrid mtest_c) - target_link_libraries(gather simgrid mtest_c) -# target_link_libraries(iallred simgrid mtest_c) -# target_link_libraries(ibarrier simgrid mtest_c) -# target_link_libraries(icallgather simgrid mtest_c) -# target_link_libraries(icallgatherv simgrid mtest_c) -# target_link_libraries(icallreduce simgrid mtest_c) -# target_link_libraries(icalltoall simgrid mtest_c) -# target_link_libraries(icalltoallv simgrid mtest_c) -# target_link_libraries(icalltoallw simgrid mtest_c) -# target_link_libraries(icbarrier simgrid mtest_c) -# target_link_libraries(icbcast simgrid mtest_c) -# target_link_libraries(icgather simgrid mtest_c) -# target_link_libraries(icgatherv simgrid mtest_c) -# target_link_libraries(icreduce simgrid mtest_c) -# target_link_libraries(icscatter simgrid mtest_c) -# target_link_libraries(icscatterv simgrid mtest_c) - target_link_libraries(longuser simgrid mtest_c) -# target_link_libraries(nonblocking2 simgrid mtest_c) -# target_link_libraries(nonblocking3 simgrid mtest_c) -# target_link_libraries(nonblocking simgrid mtest_c) -# target_link_libraries(opband simgrid mtest_c) -# target_link_libraries(opbor simgrid mtest_c) -# target_link_libraries(opbxor simgrid mtest_c) - target_link_libraries(op_commutative simgrid mtest_c) -# target_link_libraries(opland simgrid mtest_c) -# target_link_libraries(oplor simgrid mtest_c) -# target_link_libraries(oplxor simgrid mtest_c) -# target_link_libraries(opmax simgrid mtest_c) -# target_link_libraries(opmaxloc simgrid mtest_c) -# target_link_libraries(opmin simgrid mtest_c) -# target_link_libraries(opminloc simgrid mtest_c) -# target_link_libraries(opprod simgrid mtest_c) -# target_link_libraries(opsum simgrid mtest_c) - target_link_libraries(red3 simgrid mtest_c) - target_link_libraries(red4 simgrid mtest_c) - target_link_libraries(redscat2 simgrid mtest_c) - target_link_libraries(redscat3 simgrid mtest_c) - target_link_libraries(redscatbkinter simgrid mtest_c) - target_link_libraries(redscatblk3 simgrid mtest_c) - target_link_libraries(red_scat_block2 simgrid mtest_c) - target_link_libraries(red_scat_block simgrid mtest_c) - target_link_libraries(redscat simgrid mtest_c) -# target_link_libraries(redscatinter simgrid mtest_c) - target_link_libraries(reduce_mpich simgrid mtest_c) - target_link_libraries(reduce_local simgrid mtest_c) - target_link_libraries(scantst simgrid mtest_c) - target_link_libraries(scatter2 simgrid mtest_c) - target_link_libraries(scatter3 simgrid mtest_c) - target_link_libraries(scattern simgrid mtest_c) - target_link_libraries(scatterv simgrid mtest_c) -# target_link_libraries(uoplong simgrid mtest_c) - + foreach(test allgatherv4 allred) + if(HAVE_PRIVATIZATION) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.c) + else() + add_executable(${test} EXCLUDE_FROM_ALL ${test}_manual.c) + endif() + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_c) + endforeach() set_target_properties(allred PROPERTIES COMPILE_FLAGS "-O0" LINK_FLAGS "-O0") + + foreach(test bcast_full bcast_min_datatypes bcast_comm_world) + add_executable(${test} EXCLUDE_FROM_ALL bcast.c) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_c) + endforeach() set_target_properties(bcast_min_datatypes PROPERTIES COMPILE_FLAGS "-DBCAST_MIN_DATATYPES_ONLY" LINK_FLAGS "-DBCAST_MIN_DATATYPES_ONLY") set_target_properties(bcast_comm_world PROPERTIES COMPILE_FLAGS "-DBCAST_COMM_WORLD_ONLY" LINK_FLAGS "-DBCAST_COMM_WORLD_ONLY") - + + add_executable(reduce_mpich EXCLUDE_FROM_ALL reduce.c) + add_dependencies(tests reduce_mpich) + target_link_libraries(reduce_mpich simgrid mtest_c) + # These tests take 5 to 15 seconds to run, so we don't want to run them several times. # But at the same time, we'd like to check if they work for all factories and all privatization algorithm # Thus the current matrix diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt index 0c0520da0b..712e5d5f09 100644 --- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt @@ -13,7 +13,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) comm_info ctxalloc ctxsplit dup dup_with_info) # not compiled files # comm_idup comm_idup_mul comm_idup_overlap commname dupic ic1 ic2 iccreate icgroup icm icsplit probe-intercomm - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt index 7496797b44..3a17173e22 100644 --- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt @@ -20,12 +20,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) # pairtype-size-extent segtest simple-pack-external simple-pack-external2 sizedtypes slice-pack slice-pack-external struct-empty-el # struct-no-real-type structpack2 subarray subarray-pack tmatchsize triangular-pack unusual-noncontigs # zero-blklen-vector - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() - add_executable(sendrecvt2 ${CMAKE_CURRENT_SOURCE_DIR}/../util/dtypes.c sendrecvt2.c) - add_executable(sendrecvt4 ${CMAKE_CURRENT_SOURCE_DIR}/../util/dtypes.c sendrecvt4.c) + add_executable(sendrecvt2 EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/../util/dtypes.c sendrecvt2.c) + add_executable(sendrecvt4 EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/../util/dtypes.c sendrecvt4.c) + add_dependencies(tests sendrecvt2 sendrecvt4) target_link_libraries(sendrecvt2 simgrid mtest_c) target_link_libraries(sendrecvt4 simgrid mtest_c) set_target_properties(hindexed_block PROPERTIES COMPILE_FLAGS "-DTEST_HINDEXED_BLOCK" LINK_FLAGS "-DTEST_HINDEXED_BLOCK") diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt index 4950ac76f2..3a927daa70 100644 --- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt @@ -8,25 +8,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(attrmpi1f attrmpi1f.f) - add_executable(baseattr2f baseattr2f.f) - add_executable(baseattrf baseattrf.f) - add_executable(commattr2f commattr2f.f) - add_executable(commattr3f commattr3f.f) - add_executable(commattrf commattrf.f ) - add_executable(typeattr2f typeattr2f.f ) - add_executable(typeattr3f typeattr3f.f ) - add_executable(typeattrf typeattrf.f ) - - target_link_libraries(attrmpi1f simgrid mtest_f77) - target_link_libraries(baseattr2f simgrid mtest_f77) - target_link_libraries(baseattrf simgrid mtest_f77) - target_link_libraries(commattr2f simgrid mtest_f77) - target_link_libraries(commattr3f simgrid mtest_f77) - target_link_libraries(commattrf simgrid mtest_f77) - target_link_libraries(typeattr2f simgrid mtest_f77) - target_link_libraries(typeattr3f simgrid mtest_f77) - target_link_libraries(typeattrf simgrid mtest_f77) + foreach(test attrmpi1f + baseattrf baseattr2f + commattrf commattr2f commattr3f + typeattrf typeattr2f typeattr3f) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f77) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt index 8134355c65..9ea90c1659 100644 --- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt @@ -8,35 +8,16 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") -# add_executable(allredint8f allredint8f.f) -# add_executable(allredopttf allredopttf.f) - add_executable(alltoallvf alltoallvf.f) -# add_executable(alltoallwf alltoallwf.f) - add_executable(exscanf exscanf.f) - add_executable(inplacef inplacef.f) - # add_executable(nonblockingf nonblockingf.f) - # add_executable(nonblocking_inpf nonblocking_inpf.f) - add_executable(red_scat_blockf red_scat_blockf.f) - add_executable(redscatf redscatf.f) - add_executable(reducelocalf reducelocalf.f) - add_executable(split_typef split_typef.f) - add_executable(uallreducef uallreducef.f) - add_executable(vw_inplacef vw_inplacef.f) - -# target_link_libraries(allredint8f simgrid mtest_f77) -# target_link_libraries(allredopttf simgrid mtest_f77) - target_link_libraries(alltoallvf simgrid mtest_f77) -# target_link_libraries(alltoallwf simgrid mtest_f77) - target_link_libraries(exscanf simgrid mtest_f77) - target_link_libraries(inplacef simgrid mtest_f77) - # target_link_libraries(nonblockingf simgrid mtest_f77) - # target_link_libraries(nonblocking_inpf simgrid mtest_f77) - target_link_libraries(red_scat_blockf simgrid mtest_f77) - target_link_libraries(redscatf simgrid mtest_f77) - target_link_libraries(reducelocalf simgrid mtest_f77) - target_link_libraries(split_typef simgrid mtest_f77) - target_link_libraries(uallreducef simgrid mtest_f77) - target_link_libraries(vw_inplacef simgrid mtest_f77) + foreach(test alltoallvf + # allredint8f allredopttf alltoallwf + exscanf inplacef + # nonblockingf nonblocking_inpf + redscatf red_scat_blockf reducelocalf + split_typef uallreducef vw_inplacef) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f77) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt index cb6c37a935..8867e046a2 100644 --- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -8,11 +8,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - # add_executable(commerrf commerrf.f) -# add_executable(commnamef commnamef.f) + # add_executable(commerrf EXCLUDE_FROM_ALL commerrf.f) + # add_executable(commnamef EXCLUDE_FROM_ALL commnamef.f) + + # add_dependencies(tests commerrf commnamef) # target_link_libraries(commerrf simgrid mtest_f77) -# target_link_libraries(commnamef simgrid mtest_f77) + # target_link_libraries(commnamef simgrid mtest_f77) endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt index 330fd1ff83..ea628372e0 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt @@ -11,29 +11,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in typeaints.h @ONLY) -# add_executable(allctypesf allctypesf.f) - add_executable(gaddressf gaddressf.f) -# add_executable(hindex1f hindex1f.f) -# add_executable(hindexed_blockf hindexed_blockf.f) -# add_executable(packef packef.f) -# add_executable(typecntsf typecntsf.f) -# add_executable(typem2f typem2f.f) -# add_executable(typename3f typename3f.f) -# add_executable(typenamef typenamef.f) -# add_executable(typesnamef typesnamef.f) - add_executable(typesubf typesubf.f) - -# target_link_libraries(allctypesf simgrid mtest_f77) - target_link_libraries(gaddressf simgrid mtest_f77) -# target_link_libraries(hindex1f simgrid mtest_f77) -# target_link_libraries(hindexed_blockf simgrid mtest_f77) -# target_link_libraries(packef simgrid mtest_f77) -# target_link_libraries(typecntsf simgrid mtest_f77) -# target_link_libraries(typem2f simgrid mtest_f77) -# target_link_libraries(typename3f simgrid mtest_f77) -# target_link_libraries(typenamef simgrid mtest_f77) -# target_link_libraries(typesnamef simgrid mtest_f77) - target_link_libraries(typesubf simgrid mtest_f77) + foreach(test gaddressf + # allctypesf hindex1f hindexed_blockf packef typecntsf + # typem2f typename3f typenamef typesnamef + typesubf) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f77) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index da6e1c858b..84ac36f620 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -8,9 +8,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") -# add_executable(allocmemf allocmemf.f) -# add_executable(c2f2cf c2f2cf.f c2f2c.c) -# add_executable(ctypesinf ctypesinf.f ctypesfromc.c) +# 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) diff --git a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt index 6568a728f9..a8b8cdd559 100644 --- a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt @@ -9,8 +9,9 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(infotest2f infotest2f.f ../util/mtestf.f) - add_executable(infotestf infotestf.f ../util/mtestf.f) + add_executable(infotest2f EXCLUDE_FROM_ALL infotest2f.f ../util/mtestf.f) + add_executable(infotestf EXCLUDE_FROM_ALL infotestf.f ../util/mtestf.f) + add_dependencies(tests infotestf infotest2f) target_link_libraries(infotest2f simgrid mtest_f77) target_link_libraries(infotestf simgrid mtest_f77) endif() diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt index deda911882..6e51d8d969 100644 --- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt @@ -8,7 +8,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(baseenvf baseenvf.f) + add_executable(baseenvf EXCLUDE_FROM_ALL baseenvf.f) + add_dependencies(tests baseenvf) target_link_libraries(baseenvf simgrid mtest_f77) endif() diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index 9b0f8077f0..3e1bb3e8ab 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -9,10 +9,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(allpairf allpairf.f) -# add_executable(greqf greqf.f dummyf.f) -# add_executable(mprobef mprobef.f) - add_executable(statusesf statusesf.f) + add_executable(allpairf EXCLUDE_FROM_ALL allpairf.f) +# add_executable(greqf EXCLUDE_FROM_ALL greqf.f dummyf.f) +# add_executable(mprobef EXCLUDE_FROM_ALL mprobef.f) + add_executable(statusesf EXCLUDE_FROM_ALL statusesf.f) + add_dependencies(tests allpairf statusesf) # greqf mprobef target_link_libraries(allpairf simgrid mtest_f77) # target_link_libraries(greqf simgrid mtest_f77) diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt index 2bdb7494d4..e34c19d445 100644 --- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt @@ -8,31 +8,21 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(winaccf winaccf.f) -# add_executable(winerrf winerrf.f) - add_executable(winfencef winfencef.f) - add_executable(wingroupf wingroupf.f) -# add_executable(baseattrwinf baseattrwinf.f) -# add_executable(winattr2f winattr2f.f) -# add_executable(winattrf winattrf.f) - add_executable(c2f2cwinf c2f2cwinf.f c2f2cwin.c) - add_executable(wingetf wingetf.f) - add_executable(winnamef winnamef.f) - add_executable(winscale1f winscale1f.f) -# add_executable(winscale2f winscale2f.f) - -target_link_libraries(winaccf simgrid mtest_f77) -#target_link_libraries(winerrf simgrid mtest_f77) -target_link_libraries(winfencef simgrid mtest_f77) -target_link_libraries(wingroupf simgrid mtest_f77) -#target_link_libraries(baseattrwinf simgrid mtest_f77) -target_link_libraries(c2f2cwinf simgrid mtest_f77) -#target_link_libraries(winattr2f simgrid mtest_f77) -#target_link_libraries(winattrf simgrid mtest_f77) -target_link_libraries(wingetf simgrid mtest_f77) -target_link_libraries(winnamef simgrid mtest_f77) -target_link_libraries(winscale1f simgrid mtest_f77) -#target_link_libraries(winscale2f simgrid mtest_f77) + foreach(test winaccf + # winerrf + winfencef wingroupf + # baseattrwinf winattr2f winattrf + wingetf winnamef winscale1f + # winscale2f + ) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f77) + endforeach() + + add_executable(c2f2cwinf EXCLUDE_FROM_ALL c2f2cwinf.f c2f2cwin.c) + add_dependencies(tests c2f2cwinf) + target_link_libraries(c2f2cwinf simgrid mtest_f77) endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt index 7929cec5ab..19223a34a8 100644 --- a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt @@ -8,12 +8,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(cartcrf cartcrf.f) -# add_executable(dgraph_unwgtf dgraph_unwgtf.f) -# add_executable(dgraph_wgtf dgraph_unwgtf.f) - target_link_libraries(cartcrf simgrid mtest_f77) -# target_link_libraries(dgraph_wgtf simgrid mtest_f77) -# target_link_libraries(dgraph_unwgtf simgrid mtest_f77) + foreach(test cartcrf + # dgraph_unwgtf dgraph_wgtf + ) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f77) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt index 247b492880..07e0a693ce 100644 --- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt @@ -8,34 +8,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") -# add_executable(allredint8f90 allredint8f90.f90) -# add_executable(allredopttf90 allredopttf90.f90) - add_executable(alltoallvf90 alltoallvf90.f90) -# add_executable(alltoallwf90 alltoallwf90.f90) - add_executable(exscanf90 exscanf90.f90) - add_executable(inplacef90 inplacef90.f90) - # add_executable(nonblockingf90 nonblockingf90.f90) - # add_executable(nonblocking_inpf90 nonblocking_inpf90.f90) - add_executable(red_scat_blockf90 red_scat_blockf90.f90) - add_executable(redscatf90 redscatf90.f90) - add_executable(reducelocalf90 reducelocalf90.f90) - add_executable(split_typef90 split_typef90.f90) - add_executable(uallreducef90 uallreducef90.f90) - add_executable(vw_inplacef90 vw_inplacef90.f90) -# target_link_libraries(allredint8f90 simgrid mtest_f90) -# target_link_libraries(allredopttf90 simgrid mtest_f90) - target_link_libraries(alltoallvf90 simgrid mtest_f90) -# target_link_libraries(alltoallwf90 simgrid mtest_f90) - target_link_libraries(exscanf90 simgrid mtest_f90) - target_link_libraries(inplacef90 simgrid mtest_f90) - # target_link_libraries(nonblockingf90 simgrid mtest_f90) - # target_link_libraries(nonblocking_inpf90 simgrid mtest_f90) - target_link_libraries(red_scat_blockf90 simgrid mtest_f90) - target_link_libraries(redscatf90 simgrid mtest_f90) - target_link_libraries(reducelocalf90 simgrid mtest_f90) - target_link_libraries(split_typef90 simgrid mtest_f90) - target_link_libraries(uallreducef90 simgrid mtest_f90) - target_link_libraries(vw_inplacef90 simgrid mtest_f90) + foreach(test alltoallvf90 + # allredint8f90 allredopttf90 alltoallwf90 + exscanf90 inplacef90 + # nonblockingf90 nonblocking_inpf90 + redscatf90 red_scat_blockf90 reducelocalf90 + split_typef90 uallreducef90 vw_inplacef90) + + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f90) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt index 652b019026..5b2f44a0cd 100644 --- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt @@ -8,44 +8,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") -# add_executable(allctypesf90 allctypesf90.f90) - # add_executable(createf90 createf90.f90) - add_executable(gaddressf90 gaddressf90.f90) - # add_executable(get_elem_d get_elem_d.f90) - # add_executable(get_elem_u get_elem_u.f90) -# add_executable(hindex1f90 hindex1f90.f90) -# add_executable(hindexed_blockf90 hindexed_blockf90.f90) - add_executable(indtype indtype.f90) - add_executable(kinds kinds.f90) -# add_executable(packef90 packef90.f90) - # add_executable(sizeof sizeof.f90) - # add_executable(structf structf.f90) - # add_executable(trf90 trf90.f90) -# add_executable(typecntsf90 typecntsf90.f90) -# add_executable(typem2f90 typem2f90.f90) -# add_executable(typename3f90 typename3f90.f90) -# add_executable(typenamef90 typenamef90.f90) -# add_executable(typesnamef90 typesnamef90.f90) - add_executable(typesubf90 typesubf90.f90) -# target_link_libraries(allctypesf90 simgrid mtest_f90) - # target_link_libraries(createf90 simgrid mtest_f90) - target_link_libraries(gaddressf90 simgrid mtest_f90) - # target_link_libraries(get_elem_d simgrid mtest_f90) - # target_link_libraries(get_elem_u simgrid mtest_f90) -# target_link_libraries(hindex1f90 simgrid mtest_f90) -# target_link_libraries(hindexed_blockf90 simgrid mtest_f90) - target_link_libraries(indtype simgrid mtest_f90) - target_link_libraries(kinds simgrid mtest_f90) -# target_link_libraries(packef90 simgrid mtest_f90) - # target_link_libraries(sizeof simgrid mtest_f90) - # target_link_libraries(structf simgrid mtest_f90) - # target_link_libraries(trf90 simgrid mtest_f90) -# target_link_libraries(typecntsf90 simgrid mtest_f90) -# target_link_libraries(typem2f90 simgrid mtest_f90) -# target_link_libraries(typename3f90 simgrid mtest_f90) -# target_link_libraries(typenamef90 simgrid mtest_f90) -# target_link_libraries(typesnamef90 simgrid mtest_f90) - target_link_libraries(typesubf90 simgrid mtest_f90) + foreach(test gaddressf90 + # allctypesf90 createf90 get_elem_d get_elem_u + # hindex1f90 hindexed_blockf90 + indtype kinds + # packef90 sizeof structf trf90 typecntsf90 typem2f90 typename3f90 + # typenamef90 typesnamef90 + typesubf90) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f90) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt index e70c7a0e02..0f3bd71c0f 100644 --- a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt @@ -8,10 +8,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(infotest2f90 infotest2f90.f90 ../util/mtestf90.f90) - add_executable(infotestf90 infotestf90.f90 ../util/mtestf90.f90) - target_link_libraries(infotest2f90 simgrid mtest_f90) - target_link_libraries(infotestf90 simgrid mtest_f90) + foreach(test infotest2f90 infotestf90) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f90) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt index 1cb8e906af..cd3e8f32ed 100644 --- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt @@ -8,7 +8,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(baseenvf90 baseenvf90.f90) + add_executable(baseenvf90 EXCLUDE_FROM_ALL baseenvf90.f90) + add_dependencies(tests baseenvf90) target_link_libraries(baseenvf90 simgrid mtest_f90) endif() diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt index 5045e564fd..3b47871691 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt @@ -7,15 +7,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - - add_executable(allpairf90 allpairf90.f90) -# add_executable(greqf90 greqf90.f90 dummyf90.f90) -# add_executable(mprobef90 mprobef90.f90) - add_executable(statusesf90 statusesf90.f90) - target_link_libraries(allpairf90 simgrid mtest_f90) -# target_link_libraries(greqf90 simgrid mtest_f90) -# target_link_libraries(mprobef90 simgrid mtest_f90) - target_link_libraries(statusesf90 simgrid mtest_f90) + + foreach(test allpairf90 + # greqf90 mprobef90 + statusesf90) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f90) + endforeach() endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt index fb41d8b0c1..2dbd9552f7 100644 --- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt @@ -7,32 +7,22 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") + + foreach(test winaccf90 + # winerrf90 + winfencef90 wingroupf90 + # baseattrwinf90 winattr2f90 winattrf90 + wingetf90 winnamef90 winscale1f90 + # winscale2f90 + ) + add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90) + add_dependencies(tests ${test}) + target_link_libraries(${test} simgrid mtest_f90) + endforeach() - add_executable(winaccf90 winaccf90.f90) -# add_executable(winerrf90 winerrf90.f90) - add_executable(winfencef90 winfencef90.f90) - add_executable(wingroupf90 wingroupf90.f90) -# add_executable(baseattrwinf90 baseattrwinf90.f90) -# add_executable(winattr2f90 winattr2f90.f90) -# add_executable(winattrf90 winattrf90.f90) - add_executable(c2f2cwinf90 c2f2cwinf90.f90 c2f902cwin.c) - add_executable(wingetf90 wingetf90.f90) - add_executable(winnamef90 winnamef90.f90) - add_executable(winscale1f90 winscale1f90.f90) -# add_executable(winscale2f90 winscale2f90.f90) - -target_link_libraries(winaccf90 simgrid mtest_f90) -#target_link_libraries(winerrf90 simgrid mtest_f90) -target_link_libraries(winfencef90 simgrid mtest_f90) -target_link_libraries(wingroupf90 simgrid mtest_f90) -#target_link_libraries(baseattrwinf90 simgrid mtest_f90) -target_link_libraries(c2f2cwinf90 simgrid mtest_f90) -#target_link_libraries(winattr2f90 simgrid mtest_f90) -#target_link_libraries(winattrf90 simgrid mtest_f90) -target_link_libraries(wingetf90 simgrid mtest_f90) -target_link_libraries(winnamef90 simgrid mtest_f90) -target_link_libraries(winscale1f90 simgrid mtest_f90) -#target_link_libraries(winscale2f90 simgrid mtest_f90) + add_executable(c2f2cwinf90 EXCLUDE_FROM_ALL c2f2cwinf90.f90 c2f902cwin.c) + add_dependencies(tests c2f2cwinf90) + target_link_libraries(c2f2cwinf90 simgrid mtest_f90) endif() set(examples_src diff --git a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt index 36e1944df6..24a76deb09 100644 --- a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt @@ -10,7 +10,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") foreach(file groupcreate grouptest2 grouptest gtranks gtranksperf) #groupnullincl glpid - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() diff --git a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt index dde4c7c69b..92f123a688 100644 --- a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt @@ -10,7 +10,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") foreach(file infodel infodup infomany2 infomany infoorder infotest infoget infovallen) #infoenv - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() diff --git a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt index 1623f5e5c9..b589c1dcf0 100644 --- a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt @@ -10,7 +10,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") foreach(file exitst1 exitst2 finalized initstat library_version version) # not compiled files: attrself exitst3 timeout - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() diff --git a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt index 1535753570..85e5185968 100644 --- a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt @@ -11,7 +11,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) foreach(file commcreatep non_zero_root sendrecvl timer transp-datatype twovec dtpack indexperf nestvec2 nestvec) #not compiled files manyrma - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt index 2a495bd963..7c537a4c29 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt @@ -13,7 +13,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) dtype_send probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull many_isend manylmt recv_any scancel scancel2 rcancel) # not compiled files: big_count_status bsend1 bsend2 bsend3 bsend4 bsend5 bsendalign bsendfrag bsendpending mprobe # cancelrecv greq1 icsend large_message pscancel rqfreeb rqstatus sendself scancel_unmatch - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index 47d8b72e13..d1be6d3b19 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -29,12 +29,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) # win_shared_zerobyte aint derived-acc-flush_local large-acc-flush_local # win_shared_create win_shared_put_flush_get win_shared_rma_flush_load # wrma_flush_get - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) set_target_properties(${file} PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") endforeach() - add_executable(transpose3_shm transpose3.c) + add_executable(transpose3_shm EXCLUDE_FROM_ALL transpose3.c) + add_dependencies(tests transpose3_shm) target_link_libraries(transpose3_shm simgrid mtest_c) set_target_properties(transpose3_shm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS} -DUSE_WIN_ALLOCATE") endif() diff --git a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt index abaee66a59..f26f4e7f68 100644 --- a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt @@ -12,7 +12,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) foreach(file cartcreates cartshift1 cartsuball cartzero) # not compiled files # cartmap1 dgraph_unwgt dims1 dims2 dims3 dims4 distgraph1 graphcr2 graphcr graphmap1 neighb_coll topodup topotest - add_executable(${file} ${file}.c) + add_executable(${file} EXCLUDE_FROM_ALL ${file}.c) + add_dependencies(tests ${file}) target_link_libraries(${file} simgrid mtest_c) endforeach() endif() -- 2.20.1