Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
avoid compiling too many times mtest files from mpich testsuite, just use it as a...
authorAugustin Degomme <degomme@idpann.imag.fr>
Mon, 13 Jan 2014 13:46:14 +0000 (14:46 +0100)
committerAugustin Degomme <degomme@idpann.imag.fr>
Mon, 13 Jan 2014 13:46:14 +0000 (14:46 +0100)
This should speed up compilation of testsuite, and avoid problems with parallel builds

23 files changed:
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeExe.cmake
teshsuite/smpi/mpich3-test/CMakeLists.txt
teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt [new file with mode: 0644]
teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt [new file with mode: 0644]
teshsuite/smpi/mpich3-test/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt

index f4ec3ec..d5f6c7f 100644 (file)
@@ -943,6 +943,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/group/CMakeLists.txt
   teshsuite/smpi/mpich3-test/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
 #  teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
@@ -950,6 +951,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
index 4c6d9d2..59794d0 100644 (file)
@@ -100,12 +100,14 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/pt2pt)
 
 #add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/attr)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/util)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/coll)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/comm)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/datatype)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/ext)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/init)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/pt2pt)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/util)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/coll)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/datatype)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/init)
index 645ace8..f8b8f8e 100644 (file)
@@ -45,3 +45,22 @@ set(txt_files
   ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestconf.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h
   PARENT_SCOPE)
+
+
+#build only once files used in each test (C version compiled here at root, F77 is in f77/util, and F90 in F90/util)
+
+if(WIN32)
+  set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
+else()
+  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
+endif()
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/")
+
+#C version
+add_library(mtest_c STATIC util/mtest.c)
+
+
+
index 90e04da..0eda4eb 100644 (file)
@@ -13,41 +13,41 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(attr2type attr2type.c ../util/mtest.c)
-  add_executable(attrend2 attrend2.c ../util/mtest.c)
-  add_executable(attrend attrend.c ../util/mtest.c)
-  add_executable(attrerr attrerr.c ../util/mtest.c)
-  add_executable(attrerrcomm attrerrcomm.c ../util/mtest.c)
-  add_executable(attrerrtype attrerrtype.c ../util/mtest.c)
-  add_executable(attric attric.c ../util/mtest.c)
-  add_executable(attrorder attrorder.c ../util/mtest.c)
-  add_executable(attrordercomm attrordercomm.c ../util/mtest.c)
-  add_executable(attrordertype attrordertype.c ../util/mtest.c)
-  add_executable(attrt attrt.c ../util/mtest.c)
-  add_executable(baseattr2 baseattr2.c ../util/mtest.c)
-  add_executable(baseattrcomm baseattrcomm.c ../util/mtest.c)
-  add_executable(fkeyval fkeyval.c ../util/mtest.c)
-  add_executable(fkeyvalcomm fkeyvalcomm.c ../util/mtest.c)
-  add_executable(fkeyvaltype fkeyvaltype.c ../util/mtest.c)
-  add_executable(keyval_double_free keyval_double_free.c ../util/mtest.c)
+  add_executable(attr2type attr2type.c)
+  add_executable(attrend2 attrend2.c)
+  add_executable(attrend attrend.c)
+  add_executable(attrerr attrerr.c)
+  add_executable(attrerrcomm attrerrcomm.c)
+  add_executable(attrerrtype attrerrtype.c)
+  add_executable(attric attric.c)
+  add_executable(attrorder attrorder.c)
+  add_executable(attrordercomm attrordercomm.c)
+  add_executable(attrordertype attrordertype.c)
+  add_executable(attrt attrt.c)
+  add_executable(baseattr2 baseattr2.c)
+  add_executable(baseattrcomm baseattrcomm.c)
+  add_executable(fkeyval fkeyval.c)
+  add_executable(fkeyvalcomm fkeyvalcomm.c)
+  add_executable(fkeyvaltype fkeyvaltype.c)
+  add_executable(keyval_double_free keyval_double_free.c)
 
-  target_link_libraries(attr2type  simgrid)
-  target_link_libraries(attrend2 simgrid)
-  target_link_libraries(attrend simgrid)
-  target_link_libraries(attrerr simgrid)
-  target_link_libraries(attrerrcomm simgrid)
-  target_link_libraries(attrerrtype simgrid)
-  target_link_libraries(attric simgrid)
-  target_link_libraries(attrorder simgrid)
-  target_link_libraries(attrordercomm simgrid)
-  target_link_libraries(attrordertype simgrid)
-  target_link_libraries(attrt simgrid)
-  target_link_libraries(baseattr2 simgrid)
-  target_link_libraries(baseattrcomm simgrid)
-  target_link_libraries(fkeyval simgrid)
-  target_link_libraries(fkeyvalcomm simgrid)
-  target_link_libraries(fkeyvaltype simgrid)
-  target_link_libraries(keyval_double_free simgrid)
+  target_link_libraries(attr2type simgrid mtest_c)
+  target_link_libraries(attrend2 simgrid mtest_c)
+  target_link_libraries(attrend simgrid mtest_c)
+  target_link_libraries(attrerr simgrid mtest_c)
+  target_link_libraries(attrerrcomm simgrid mtest_c)
+  target_link_libraries(attrerrtype simgrid mtest_c)
+  target_link_libraries(attric simgrid mtest_c)
+  target_link_libraries(attrorder simgrid mtest_c)
+  target_link_libraries(attrordercomm simgrid mtest_c)
+  target_link_libraries(attrordertype simgrid mtest_c)
+  target_link_libraries(attrt simgrid mtest_c)
+  target_link_libraries(baseattr2 simgrid mtest_c)
+  target_link_libraries(baseattrcomm simgrid mtest_c)
+  target_link_libraries(fkeyval simgrid mtest_c)
+  target_link_libraries(fkeyvalcomm simgrid mtest_c)
+  target_link_libraries(fkeyvaltype simgrid mtest_c)
+  target_link_libraries(keyval_double_free simgrid mtest_c)
 
 endif()
 
index 4d4093b..b4a2123 100644 (file)
@@ -12,185 +12,185 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(allgather2 allgather2.c ../util/mtest.c)
-  add_executable(allgather3 allgather3.c ../util/mtest.c)
-  add_executable(allgatherv2 allgatherv2.c ../util/mtest.c)
-  add_executable(allgatherv3 allgatherv3.c ../util/mtest.c)
-  add_executable(allgatherv4 allgatherv4.c ../util/mtest.c)
-  add_executable(allred2 allred2.c ../util/mtest.c)
-  add_executable(allred3 allred3.c ../util/mtest.c)
-  add_executable(allred4 allred4.c ../util/mtest.c)
-  add_executable(allred5 allred5.c ../util/mtest.c)
-  add_executable(allred6 allred6.c ../util/mtest.c)
-#  add_executable(allred allred.c ../util/mtest.c)
-  add_executable(allredmany allredmany.c ../util/mtest.c)
-  add_executable(alltoall1 alltoall1.c ../util/mtest.c)
-  add_executable(alltoallv0 alltoallv0.c ../util/mtest.c)
-  add_executable(alltoallv alltoallv.c ../util/mtest.c)
-  add_executable(alltoallw1 alltoallw1.c ../util/mtest.c)
-  add_executable(alltoallw2 alltoallw2.c ../util/mtest.c)
-  add_executable(alltoallw_zeros alltoallw_zeros.c ../util/mtest.c)
-  add_executable(bcast2 bcast2.c ../util/mtest.c)
-  add_executable(bcast3 bcast3.c ../util/mtest.c)
-  add_executable(bcasttest bcasttest.c ../util/mtest.c)
-  add_executable(bcastzerotype bcastzerotype.c ../util/mtest.c)
-  add_executable(coll10 coll10.c ../util/mtest.c)
-  add_executable(coll11 coll11.c ../util/mtest.c)
-  add_executable(coll12 coll12.c ../util/mtest.c)
-  add_executable(coll13 coll13.c ../util/mtest.c)
-  add_executable(coll2 coll2.c ../util/mtest.c)
-  add_executable(coll3 coll3.c ../util/mtest.c)
-  add_executable(coll4 coll4.c ../util/mtest.c)
-  add_executable(coll5 coll5.c ../util/mtest.c)
-  add_executable(coll6 coll6.c ../util/mtest.c)
-  add_executable(coll7 coll7.c ../util/mtest.c)
-  add_executable(coll8 coll8.c ../util/mtest.c)
-  add_executable(coll9 coll9.c ../util/mtest.c)
-  add_executable(exscan2 exscan2.c ../util/mtest.c)
-  add_executable(exscan exscan.c ../util/mtest.c)
-  add_executable(gather2 gather2.c ../util/mtest.c)
-  add_executable(gather2_save gather2_save.c ../util/mtest.c)
-  add_executable(gather gather.c ../util/mtest.c)
-  add_executable(iallred iallred.c ../util/mtest.c)
-  add_executable(ibarrier ibarrier.c ../util/mtest.c)
-  add_executable(icallgather icallgather.c ../util/mtest.c)
-  add_executable(icallgatherv icallgatherv.c ../util/mtest.c)
-  add_executable(icallreduce icallreduce.c ../util/mtest.c)
-  add_executable(icalltoall icalltoall.c ../util/mtest.c)
-  add_executable(icalltoallv icalltoallv.c ../util/mtest.c)
-  add_executable(icalltoallw icalltoallw.c ../util/mtest.c)
-  add_executable(icbarrier icbarrier.c ../util/mtest.c)
-  add_executable(icbcast icbcast.c ../util/mtest.c)
-  add_executable(icgather icgather.c ../util/mtest.c)
-  add_executable(icgatherv icgatherv.c ../util/mtest.c)
-  add_executable(icreduce icreduce.c ../util/mtest.c)
-  add_executable(icscatter icscatter.c ../util/mtest.c)
-  add_executable(icscatterv icscatterv.c ../util/mtest.c)
-  add_executable(longuser longuser.c ../util/mtest.c)
-  add_executable(nonblocking2 nonblocking2.c ../util/mtest.c)
-  add_executable(nonblocking3 nonblocking3.c ../util/mtest.c)
-  add_executable(nonblocking nonblocking.c ../util/mtest.c)
-  add_executable(opband opband.c ../util/mtest.c)
-  add_executable(opbor opbor.c ../util/mtest.c)
-  add_executable(opbxor opbxor.c ../util/mtest.c)
-  add_executable(op_commutative op_commutative.c ../util/mtest.c)
-  add_executable(opland opland.c ../util/mtest.c)
-  add_executable(oplor oplor.c ../util/mtest.c)
-  add_executable(oplxor oplxor.c ../util/mtest.c)
-  add_executable(opmax opmax.c ../util/mtest.c)
-  add_executable(opmaxloc opmaxloc.c ../util/mtest.c)
-  add_executable(opmin opmin.c ../util/mtest.c)
-  add_executable(opminloc opminloc.c ../util/mtest.c)
-  add_executable(opprod opprod.c ../util/mtest.c)
-  add_executable(opsum opsum.c ../util/mtest.c)
-  add_executable(red3 red3.c ../util/mtest.c)
-  add_executable(red4 red4.c ../util/mtest.c)
-  add_executable(redscat2 redscat2.c ../util/mtest.c)
-  add_executable(redscat3 redscat3.c ../util/mtest.c)
-  add_executable(redscatbkinter redscatbkinter.c ../util/mtest.c)
-  add_executable(redscatblk3 redscatblk3.c ../util/mtest.c)
-  add_executable(red_scat_block2 red_scat_block2.c ../util/mtest.c)
-  add_executable(red_scat_block red_scat_block.c ../util/mtest.c)
-  add_executable(redscat redscat.c ../util/mtest.c)
-  add_executable(redscatinter redscatinter.c ../util/mtest.c)
-  add_executable(reduce_mpich reduce.c ../util/mtest.c)
-  add_executable(reduce_local reduce_local.c ../util/mtest.c)
-  add_executable(scantst scantst.c ../util/mtest.c)
-  add_executable(scatter2 scatter2.c ../util/mtest.c)
-  add_executable(scatter3 scatter3.c ../util/mtest.c)
-  add_executable(scattern scattern.c ../util/mtest.c)
-  add_executable(scatterv scatterv.c ../util/mtest.c)
-  add_executable(uoplong uoplong.c ../util/mtest.c)
+  add_executable(allgather2 allgather2.c)
+  add_executable(allgather3 allgather3.c)
+  add_executable(allgatherv2 allgatherv2.c)
+  add_executable(allgatherv3 allgatherv3.c)
+  add_executable(allgatherv4 allgatherv4.c)
+  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)
+#  add_executable(allred allred.c)
+  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(bcast2 bcast2.c)
+  add_executable(bcast3 bcast3.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(gather2_save gather2_save.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)
-  target_link_libraries(allgather3  simgrid)
-  target_link_libraries(allgatherv2  simgrid)
-  target_link_libraries(allgatherv3  simgrid)
-  target_link_libraries(allgatherv4  simgrid)
-  target_link_libraries(allred2  simgrid)
-  target_link_libraries(allred3  simgrid)
-  target_link_libraries(allred4  simgrid)
-  target_link_libraries(allred5  simgrid)
-  target_link_libraries(allred6  simgrid)
-#  target_link_libraries(allred  simgrid)
-  target_link_libraries(allredmany  simgrid)
-  target_link_libraries(alltoall1  simgrid)
-  target_link_libraries(alltoallv0  simgrid)
-  target_link_libraries(alltoallv  simgrid)
-  target_link_libraries(alltoallw1  simgrid)
-  target_link_libraries(alltoallw2  simgrid)
-  target_link_libraries(alltoallw_zeros  simgrid)
-  target_link_libraries(bcast2  simgrid)
-  target_link_libraries(bcast3  simgrid)
-  target_link_libraries(bcasttest  simgrid)
-  target_link_libraries(bcastzerotype  simgrid)
-  target_link_libraries(coll10  simgrid)
-  target_link_libraries(coll11  simgrid)
-  target_link_libraries(coll12  simgrid)
-  target_link_libraries(coll13  simgrid)
-  target_link_libraries(coll2  simgrid)
-  target_link_libraries(coll3  simgrid)
-  target_link_libraries(coll4  simgrid)
-  target_link_libraries(coll5  simgrid)
-  target_link_libraries(coll6  simgrid)
-  target_link_libraries(coll7  simgrid)
-  target_link_libraries(coll8  simgrid)
-  target_link_libraries(coll9  simgrid)
-  target_link_libraries(exscan2  simgrid)
-  target_link_libraries(exscan  simgrid)
-  target_link_libraries(gather2  simgrid)
-  target_link_libraries(gather2_save  simgrid)
-  target_link_libraries(gather  simgrid)
-  target_link_libraries(iallred  simgrid)
-  target_link_libraries(ibarrier  simgrid)
-  target_link_libraries(icallgather  simgrid)
-  target_link_libraries(icallgatherv  simgrid)
-  target_link_libraries(icallreduce  simgrid)
-  target_link_libraries(icalltoall  simgrid)
-  target_link_libraries(icalltoallv  simgrid)
-  target_link_libraries(icalltoallw  simgrid)
-  target_link_libraries(icbarrier  simgrid)
-  target_link_libraries(icbcast  simgrid)
-  target_link_libraries(icgather  simgrid)
-  target_link_libraries(icgatherv  simgrid)
-  target_link_libraries(icreduce  simgrid)
-  target_link_libraries(icscatter  simgrid)
-  target_link_libraries(icscatterv  simgrid)
-  target_link_libraries(longuser  simgrid)
-  target_link_libraries(nonblocking2  simgrid)
-  target_link_libraries(nonblocking3  simgrid)
-  target_link_libraries(nonblocking  simgrid)
-  target_link_libraries(opband  simgrid)
-  target_link_libraries(opbor  simgrid)
-  target_link_libraries(opbxor  simgrid)
-  target_link_libraries(op_commutative  simgrid)
-  target_link_libraries(opland  simgrid)
-  target_link_libraries(oplor  simgrid)
-  target_link_libraries(oplxor  simgrid)
-  target_link_libraries(opmax  simgrid)
-  target_link_libraries(opmaxloc  simgrid)
-  target_link_libraries(opmin  simgrid)
-  target_link_libraries(opminloc  simgrid)
-  target_link_libraries(opprod  simgrid)
-  target_link_libraries(opsum  simgrid)
-  target_link_libraries(red3  simgrid)
-  target_link_libraries(red4  simgrid)
-  target_link_libraries(redscat2  simgrid)
-  target_link_libraries(redscat3  simgrid)
-  target_link_libraries(redscatbkinter  simgrid)
-  target_link_libraries(redscatblk3  simgrid)
-  target_link_libraries(red_scat_block2  simgrid)
-  target_link_libraries(red_scat_block  simgrid)
-  target_link_libraries(redscat  simgrid)
-  target_link_libraries(redscatinter  simgrid)
-  target_link_libraries(reduce_mpich  simgrid)
-  target_link_libraries(reduce_local  simgrid)
-  target_link_libraries(scantst  simgrid)
-  target_link_libraries(scatter2  simgrid)
-  target_link_libraries(scatter3  simgrid)
-  target_link_libraries(scattern  simgrid)
-  target_link_libraries(scatterv  simgrid)
-  target_link_libraries(uoplong  simgrid)
+  target_link_libraries(allgather2  simgrid mtest_c)
+  target_link_libraries(allgather3  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(bcast2  simgrid mtest_c)
+  target_link_libraries(bcast3  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(gather2_save  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)
 
 endif()
 
index 030ac6b..5490521 100644 (file)
@@ -12,53 +12,53 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(cmfree cmfree.c ../util/mtest.c)
-  add_executable(cmsplit2 cmsplit2.c ../util/mtest.c)
-  add_executable(cmsplit cmsplit.c ../util/mtest.c)
-  add_executable(cmsplit_type cmsplit_type.c ../util/mtest.c)
-  add_executable(commcreate1 commcreate1.c ../util/mtest.c)
-  add_executable(comm_create_group comm_create_group.c ../util/mtest.c)
-  add_executable(comm_group_half comm_group_half.c ../util/mtest.c)
-  add_executable(comm_group_rand comm_group_rand.c ../util/mtest.c)
- # add_executable(comm_idup comm_idup.c ../util/mtest.c)
-  add_executable(comm_info comm_info.c ../util/mtest.c)
-  add_executable(commname commname.c ../util/mtest.c)
-  add_executable(ctxalloc ctxalloc.c ../util/mtest.c)
-  add_executable(ctxsplit ctxsplit.c ../util/mtest.c)
-  add_executable(dup dup.c ../util/mtest.c)
-  add_executable(dupic dupic.c ../util/mtest.c)
-  add_executable(dup_with_info dup_with_info.c ../util/mtest.c)
-  add_executable(ic1 ic1.c ../util/mtest.c)
-  add_executable(ic2 ic2.c ../util/mtest.c)
-  add_executable(iccreate iccreate.c ../util/mtest.c)
-  add_executable(icgroup icgroup.c ../util/mtest.c)
-  add_executable(icm icm.c ../util/mtest.c)
-  add_executable(icsplit icsplit.c ../util/mtest.c)
-  add_executable(probe-intercomm probe-intercomm.c ../util/mtest.c)
+  add_executable(cmfree cmfree.c)
+  add_executable(cmsplit2 cmsplit2.c)
+  add_executable(cmsplit cmsplit.c)
+  add_executable(cmsplit_type cmsplit_type.c)
+  add_executable(commcreate1 commcreate1.c)
+  add_executable(comm_create_group comm_create_group.c)
+  add_executable(comm_group_half comm_group_half.c)
+  add_executable(comm_group_rand comm_group_rand.c)
+ # add_executable(comm_idup comm_idup.c)
+  add_executable(comm_info comm_info.c)
+  add_executable(commname commname.c)
+  add_executable(ctxalloc ctxalloc.c)
+  add_executable(ctxsplit ctxsplit.c)
+  add_executable(dup dup.c)
+  add_executable(dupic dupic.c)
+  add_executable(dup_with_info dup_with_info.c)
+  add_executable(ic1 ic1.c)
+  add_executable(ic2 ic2.c)
+  add_executable(iccreate iccreate.c)
+  add_executable(icgroup icgroup.c)
+  add_executable(icm icm.c)
+  add_executable(icsplit icsplit.c)
+  add_executable(probe-intercomm probe-intercomm.c)
 
-  target_link_libraries(cmfree  simgrid)
-  target_link_libraries(cmsplit2  simgrid)
-  target_link_libraries(cmsplit  simgrid)
-  target_link_libraries(cmsplit_type  simgrid)
-  target_link_libraries(commcreate1  simgrid)
-  target_link_libraries(comm_create_group  simgrid)
-  target_link_libraries(comm_group_half  simgrid)
-  target_link_libraries(comm_group_rand  simgrid)
- # target_link_libraries(comm_idup  simgrid)
-  target_link_libraries(comm_info  simgrid)
-  target_link_libraries(commname  simgrid)
-  target_link_libraries(ctxalloc  simgrid)
-  target_link_libraries(ctxsplit  simgrid)
-  target_link_libraries(dup  simgrid)
-  target_link_libraries(dupic  simgrid)
-  target_link_libraries(dup_with_info  simgrid)
-  target_link_libraries(ic1  simgrid)
-  target_link_libraries(ic2  simgrid)
-  target_link_libraries(iccreate  simgrid)
-  target_link_libraries(icgroup  simgrid)
-  target_link_libraries(icm  simgrid)
-  target_link_libraries(icsplit  simgrid)
-  target_link_libraries(probe-intercomm  simgrid)
+  target_link_libraries(cmfree simgrid mtest_c)
+  target_link_libraries(cmsplit2 simgrid mtest_c)
+  target_link_libraries(cmsplit simgrid mtest_c)
+  target_link_libraries(cmsplit_type simgrid mtest_c)
+  target_link_libraries(commcreate1 simgrid mtest_c)
+  target_link_libraries(comm_create_group simgrid mtest_c)
+  target_link_libraries(comm_group_half simgrid mtest_c)
+  target_link_libraries(comm_group_rand simgrid mtest_c)
+ # target_link_libraries(comm_idup simgrid mtest_c)
+  target_link_libraries(comm_info simgrid mtest_c)
+  target_link_libraries(commname simgrid mtest_c)
+  target_link_libraries(ctxalloc simgrid mtest_c)
+  target_link_libraries(ctxsplit simgrid mtest_c)
+  target_link_libraries(dup simgrid mtest_c)
+  target_link_libraries(dupic simgrid mtest_c)
+  target_link_libraries(dup_with_info simgrid mtest_c)
+  target_link_libraries(ic1 simgrid mtest_c)
+  target_link_libraries(ic2 simgrid mtest_c)
+  target_link_libraries(iccreate simgrid mtest_c)
+  target_link_libraries(icgroup simgrid mtest_c)
+  target_link_libraries(icm simgrid mtest_c)
+  target_link_libraries(icsplit simgrid mtest_c)
+  target_link_libraries(probe-intercomm simgrid mtest_c)
 
 endif()
 
index 9a95d09..cb08ae7 100644 (file)
@@ -12,117 +12,117 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(blockindexed-misc blockindexed-misc.c ../util/mtest.c)
-  add_executable(blockindexed-zero-count blockindexed-zero-count.c ../util/mtest.c)
-  add_executable(contents contents.c ../util/mtest.c)
-  add_executable(contigstruct contigstruct.c ../util/mtest.c)
-  add_executable(contig-zero-count contig-zero-count.c ../util/mtest.c)
-  add_executable(cxx-types cxx-types.c ../util/mtest.c)
-  add_executable(darray-cyclic darray-cyclic.c ../util/mtest.c)
-  add_executable(darray-pack darray-pack.c ../util/mtest.c)
-  add_executable(gaddress gaddress.c ../util/mtest.c)
-  add_executable(get-elements get-elements.c ../util/mtest.c)
-  add_executable(get-elements-pairtype get-elements-pairtype.c ../util/mtest.c)
-  add_executable(getpartelm getpartelm.c ../util/mtest.c)
-  add_executable(hindexed_block hindexed_block.c ../util/mtest.c)
-  add_executable(hindexed_block_contents hindexed_block_contents.c ../util/mtest.c)
-  add_executable(hindexed-zeros hindexed-zeros.c ../util/mtest.c)
-  add_executable(indexed-misc indexed-misc.c ../util/mtest.c)
-  add_executable(large-count large-count.c ../util/mtest.c)
-  add_executable(lbub lbub.c ../util/mtest.c)
-  add_executable(localpack localpack.c ../util/mtest.c)
-  add_executable(longdouble longdouble.c ../util/mtest.c)
-  add_executable(lots-of-types lots-of-types.c ../util/mtest.c)
-  add_executable(pairtype-pack pairtype-pack.c ../util/mtest.c)
-  add_executable(pairtype-size-extent pairtype-size-extent.c ../util/mtest.c)
-  add_executable(simple-commit simple-commit.c ../util/mtest.c)
-  add_executable(simple-pack simple-pack.c ../util/mtest.c)
-  add_executable(simple-pack-external simple-pack-external.c ../util/mtest.c)
-  add_executable(simple-resized simple-resized.c ../util/mtest.c)
-  add_executable(simple-size-extent simple-size-extent.c ../util/mtest.c)
-  add_executable(sizedtypes sizedtypes.c ../util/mtest.c)
-  add_executable(slice-pack slice-pack.c ../util/mtest.c)
-  add_executable(slice-pack-external slice-pack-external.c ../util/mtest.c)
-  add_executable(struct-derived-zeros struct-derived-zeros.c ../util/mtest.c)
-  add_executable(struct-empty-el struct-empty-el.c ../util/mtest.c)
-  add_executable(struct-ezhov struct-ezhov.c ../util/mtest.c)
-  add_executable(struct-no-real-types struct-no-real-types.c ../util/mtest.c)
-  add_executable(struct-pack struct-pack.c ../util/mtest.c)
-  add_executable(struct-verydeep struct-verydeep.c ../util/mtest.c)
-  add_executable(struct-zero-count struct-zero-count.c ../util/mtest.c)
-  add_executable(subarray subarray.c ../util/mtest.c)
-  add_executable(subarray-pack subarray-pack.c ../util/mtest.c)
-  add_executable(tfree tfree.c ../util/mtest.c)
-  add_executable(tmatchsize tmatchsize.c ../util/mtest.c)
-  add_executable(transpose-pack transpose-pack.c ../util/mtest.c)
-  add_executable(tresized2 tresized2.c ../util/mtest.c)
-  add_executable(tresized tresized.c ../util/mtest.c)
-  add_executable(triangular-pack triangular-pack.c ../util/mtest.c)
-  add_executable(typecommit typecommit.c ../util/mtest.c)
-  add_executable(typefree typefree.c ../util/mtest.c)
-  add_executable(typelb typelb.c ../util/mtest.c)
-  add_executable(typename typename.c ../util/mtest.c)
-  add_executable(unpack unpack.c ../util/mtest.c)
-  add_executable(unusual-noncontigs unusual-noncontigs.c ../util/mtest.c)
-  add_executable(zero-blklen-vector zero-blklen-vector.c ../util/mtest.c)
-  add_executable(zeroblks zeroblks.c ../util/mtest.c)
-  add_executable(zeroparms zeroparms.c ../util/mtest.c)
+  add_executable(blockindexed-misc blockindexed-misc.c)
+  add_executable(blockindexed-zero-count blockindexed-zero-count.c)
+  add_executable(contents contents.c)
+  add_executable(contigstruct contigstruct.c)
+  add_executable(contig-zero-count contig-zero-count.c)
+  add_executable(cxx-types cxx-types.c)
+  add_executable(darray-cyclic darray-cyclic.c)
+  add_executable(darray-pack darray-pack.c)
+  add_executable(gaddress gaddress.c)
+  add_executable(get-elements get-elements.c)
+  add_executable(get-elements-pairtype get-elements-pairtype.c)
+  add_executable(getpartelm getpartelm.c)
+  add_executable(hindexed_block hindexed_block.c)
+  add_executable(hindexed_block_contents hindexed_block_contents.c)
+  add_executable(hindexed-zeros hindexed-zeros.c)
+  add_executable(indexed-misc indexed-misc.c)
+  add_executable(large-count large-count.c)
+  add_executable(lbub lbub.c)
+  add_executable(localpack localpack.c)
+  add_executable(longdouble longdouble.c)
+  add_executable(lots-of-types lots-of-types.c)
+  add_executable(pairtype-pack pairtype-pack.c)
+  add_executable(pairtype-size-extent pairtype-size-extent.c)
+  add_executable(simple-commit simple-commit.c)
+  add_executable(simple-pack simple-pack.c)
+  add_executable(simple-pack-external simple-pack-external.c)
+  add_executable(simple-resized simple-resized.c)
+  add_executable(simple-size-extent simple-size-extent.c)
+  add_executable(sizedtypes sizedtypes.c)
+  add_executable(slice-pack slice-pack.c)
+  add_executable(slice-pack-external slice-pack-external.c)
+  add_executable(struct-derived-zeros struct-derived-zeros.c)
+  add_executable(struct-empty-el struct-empty-el.c)
+  add_executable(struct-ezhov struct-ezhov.c)
+  add_executable(struct-no-real-types struct-no-real-types.c)
+  add_executable(struct-pack struct-pack.c)
+  add_executable(struct-verydeep struct-verydeep.c)
+  add_executable(struct-zero-count struct-zero-count.c)
+  add_executable(subarray subarray.c)
+  add_executable(subarray-pack subarray-pack.c)
+  add_executable(tfree tfree.c)
+  add_executable(tmatchsize tmatchsize.c)
+  add_executable(transpose-pack transpose-pack.c)
+  add_executable(tresized2 tresized2.c)
+  add_executable(tresized tresized.c)
+  add_executable(triangular-pack triangular-pack.c)
+  add_executable(typecommit typecommit.c)
+  add_executable(typefree typefree.c)
+  add_executable(typelb typelb.c)
+  add_executable(typename typename.c)
+  add_executable(unpack unpack.c)
+  add_executable(unusual-noncontigs unusual-noncontigs.c)
+  add_executable(zero-blklen-vector zero-blklen-vector.c)
+  add_executable(zeroblks zeroblks.c)
+  add_executable(zeroparms zeroparms.c)
 
-  target_link_libraries(blockindexed-misc  simgrid)
-  target_link_libraries(blockindexed-zero-count  simgrid)
-  target_link_libraries(contents  simgrid)
-  target_link_libraries(contigstruct  simgrid)
-  target_link_libraries(contig-zero-count  simgrid)
-  target_link_libraries(cxx-types  simgrid)
-  target_link_libraries(darray-cyclic  simgrid)
-  target_link_libraries(darray-pack  simgrid)
-  target_link_libraries(gaddress  simgrid)
-  target_link_libraries(get-elements  simgrid)
-  target_link_libraries(get-elements-pairtype  simgrid)
-  target_link_libraries(getpartelm  simgrid)
-  target_link_libraries(hindexed_block  simgrid)
-  target_link_libraries(hindexed_block_contents  simgrid)
-  target_link_libraries(hindexed-zeros  simgrid)
-  target_link_libraries(indexed-misc  simgrid)
-  target_link_libraries(large-count  simgrid)
-  target_link_libraries(lbub  simgrid)
-  target_link_libraries(localpack  simgrid)
-  target_link_libraries(longdouble  simgrid)
-  target_link_libraries(lots-of-types  simgrid)
-  target_link_libraries(pairtype-pack  simgrid)
-  target_link_libraries(pairtype-size-extent  simgrid)
-  target_link_libraries(simple-commit  simgrid)
-  target_link_libraries(simple-pack  simgrid)
-  target_link_libraries(simple-pack-external  simgrid)
-  target_link_libraries(simple-resized  simgrid)
-  target_link_libraries(simple-size-extent  simgrid)
-  target_link_libraries(sizedtypes  simgrid)
-  target_link_libraries(slice-pack  simgrid)
-  target_link_libraries(slice-pack-external  simgrid)
-  target_link_libraries(struct-derived-zeros  simgrid)
-  target_link_libraries(struct-empty-el  simgrid)
-  target_link_libraries(struct-ezhov  simgrid)
-  target_link_libraries(struct-no-real-types  simgrid)
-  target_link_libraries(struct-pack  simgrid)
-  target_link_libraries(struct-verydeep  simgrid)
-  target_link_libraries(struct-zero-count  simgrid)
-  target_link_libraries(subarray  simgrid)
-  target_link_libraries(subarray-pack  simgrid)
-  target_link_libraries(tfree  simgrid)
-  target_link_libraries(tmatchsize  simgrid)
-  target_link_libraries(transpose-pack  simgrid)
-  target_link_libraries(tresized2  simgrid)
-  target_link_libraries(tresized  simgrid)
-  target_link_libraries(triangular-pack  simgrid)
-  target_link_libraries(typecommit  simgrid)
-  target_link_libraries(typefree  simgrid)
-  target_link_libraries(typelb  simgrid)
-  target_link_libraries(typename  simgrid)
-  target_link_libraries(unpack  simgrid)
-  target_link_libraries(unusual-noncontigs  simgrid)
-  target_link_libraries(zero-blklen-vector  simgrid)
-  target_link_libraries(zeroblks  simgrid)
-  target_link_libraries(zeroparms  simgrid)
+  target_link_libraries(blockindexed-misc simgrid mtest_c)
+  target_link_libraries(blockindexed-zero-count simgrid mtest_c)
+  target_link_libraries(contents simgrid mtest_c)
+  target_link_libraries(contigstruct simgrid mtest_c)
+  target_link_libraries(contig-zero-count simgrid mtest_c)
+  target_link_libraries(cxx-types simgrid mtest_c)
+  target_link_libraries(darray-cyclic simgrid mtest_c)
+  target_link_libraries(darray-pack simgrid mtest_c)
+  target_link_libraries(gaddress simgrid mtest_c)
+  target_link_libraries(get-elements simgrid mtest_c)
+  target_link_libraries(get-elements-pairtype simgrid mtest_c)
+  target_link_libraries(getpartelm simgrid mtest_c)
+  target_link_libraries(hindexed_block simgrid mtest_c)
+  target_link_libraries(hindexed_block_contents simgrid mtest_c)
+  target_link_libraries(hindexed-zeros simgrid mtest_c)
+  target_link_libraries(indexed-misc simgrid mtest_c)
+  target_link_libraries(large-count simgrid mtest_c)
+  target_link_libraries(lbub simgrid mtest_c)
+  target_link_libraries(localpack simgrid mtest_c)
+  target_link_libraries(longdouble simgrid mtest_c)
+  target_link_libraries(lots-of-types simgrid mtest_c)
+  target_link_libraries(pairtype-pack simgrid mtest_c)
+  target_link_libraries(pairtype-size-extent simgrid mtest_c)
+  target_link_libraries(simple-commit simgrid mtest_c)
+  target_link_libraries(simple-pack simgrid mtest_c)
+  target_link_libraries(simple-pack-external simgrid mtest_c)
+  target_link_libraries(simple-resized simgrid mtest_c)
+  target_link_libraries(simple-size-extent simgrid mtest_c)
+  target_link_libraries(sizedtypes simgrid mtest_c)
+  target_link_libraries(slice-pack simgrid mtest_c)
+  target_link_libraries(slice-pack-external simgrid mtest_c)
+  target_link_libraries(struct-derived-zeros simgrid mtest_c)
+  target_link_libraries(struct-empty-el simgrid mtest_c)
+  target_link_libraries(struct-ezhov simgrid mtest_c)
+  target_link_libraries(struct-no-real-types simgrid mtest_c)
+  target_link_libraries(struct-pack simgrid mtest_c)
+  target_link_libraries(struct-verydeep simgrid mtest_c)
+  target_link_libraries(struct-zero-count simgrid mtest_c)
+  target_link_libraries(subarray simgrid mtest_c)
+  target_link_libraries(subarray-pack simgrid mtest_c)
+  target_link_libraries(tfree simgrid mtest_c)
+  target_link_libraries(tmatchsize simgrid mtest_c)
+  target_link_libraries(transpose-pack simgrid mtest_c)
+  target_link_libraries(tresized2 simgrid mtest_c)
+  target_link_libraries(tresized simgrid mtest_c)
+  target_link_libraries(triangular-pack simgrid mtest_c)
+  target_link_libraries(typecommit simgrid mtest_c)
+  target_link_libraries(typefree simgrid mtest_c)
+  target_link_libraries(typelb simgrid mtest_c)
+  target_link_libraries(typename simgrid mtest_c)
+  target_link_libraries(unpack simgrid mtest_c)
+  target_link_libraries(unusual-noncontigs simgrid mtest_c)
+  target_link_libraries(zero-blklen-vector simgrid mtest_c)
+  target_link_libraries(zeroblks simgrid mtest_c)
+  target_link_libraries(zeroparms simgrid mtest_c)
 
 endif()
 
index 46e9d88..b3f9899 100644 (file)
@@ -12,36 +12,36 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../include/")
 
-  add_executable(attrmpi1f attrmpi1f.f ../util/mtestf.f)
-  add_executable(baseattr2f baseattr2f.f ../util/mtestf.f)
-  add_executable(baseattrf baseattrf.f ../util/mtestf.f)
-  add_executable(commattr2f commattr2f.f ../util/mtestf.f)
-  add_executable(commattr3f commattr3f.f ../util/mtestf.f)
-  add_executable(commattrf commattrf.f  ../util/mtestf.f)
-  add_executable(typeattr2f typeattr2f.f  ../util/mtestf.f)
-  add_executable(typeattr3f typeattr3f.f  ../util/mtestf.f)
-  add_executable(typeattrf typeattrf.f  ../util/mtestf.f)
+  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)
-  target_link_libraries(baseattr2f  simgrid)
-  target_link_libraries(baseattrf  simgrid)
-  target_link_libraries(commattr2f  simgrid)
-  target_link_libraries(commattr3f  simgrid)
-  target_link_libraries(commattrf  simgrid)
-  target_link_libraries(typeattr2f  simgrid)
-  target_link_libraries(typeattr3f  simgrid)
-  target_link_libraries(typeattrf  simgrid)
+  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)
 
 endif()
 
 set(tesh_files
   ${tesh_files}
   PARENT_SCOPE
-  )
+)
 set(xml_files
   ${xml_files}
   PARENT_SCOPE
-  )
+)
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/attraints.h
@@ -55,13 +55,13 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typeattr3f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typeattrf.f
   PARENT_SCOPE
-  )
+)
 set(bin_files
   ${bin_files}
   PARENT_SCOPE
-  )
+)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   PARENT_SCOPE
-  )
+)
index e7264dc..690739e 100644 (file)
@@ -12,35 +12,35 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(allredint8f allredint8f.f ../util/mtestf.f)
-  add_executable(allredopttf allredopttf.f ../util/mtestf.f)
-  add_executable(alltoallvf alltoallvf.f ../util/mtestf.f)
-  add_executable(alltoallwf alltoallwf.f ../util/mtestf.f)
-  add_executable(exscanf exscanf.f ../util/mtestf.f)
-  add_executable(inplacef inplacef.f ../util/mtestf.f)
- # add_executable(nonblockingf nonblockingf.f ../util/mtestf.f)
- # add_executable(nonblocking_inpf nonblocking_inpf.f ../util/mtestf.f)
-  add_executable(red_scat_blockf red_scat_blockf.f ../util/mtestf.f)
-  add_executable(redscatf redscatf.f ../util/mtestf.f)
-  add_executable(reducelocalf reducelocalf.f ../util/mtestf.f)
-  add_executable(split_typef split_typef.f ../util/mtestf.f)
-  add_executable(uallreducef uallreducef.f ../util/mtestf.f)
-  add_executable(vw_inplacef vw_inplacef.f ../util/mtestf.f)
+  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)
-  target_link_libraries(allredopttf  simgrid)
-  target_link_libraries(alltoallvf  simgrid)
-  target_link_libraries(alltoallwf  simgrid)
-  target_link_libraries(exscanf  simgrid)
-  target_link_libraries(inplacef  simgrid)
- # target_link_libraries(nonblockingf  simgrid)
- # target_link_libraries(nonblocking_inpf  simgrid)
-  target_link_libraries(red_scat_blockf  simgrid)
-  target_link_libraries(redscatf  simgrid)
-  target_link_libraries(reducelocalf  simgrid)
-  target_link_libraries(split_typef  simgrid)
-  target_link_libraries(uallreducef  simgrid)
-  target_link_libraries(vw_inplacef  simgrid)
+  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)
 
 endif()
 
index 60e5e9f..1b02983 100644 (file)
@@ -12,11 +12,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
- # add_executable(commerrf commerrf.f ../util/mtestf.f)
-  add_executable(commnamef commnamef.f ../util/mtestf.f)
+ # add_executable(commerrf commerrf.f)
+  add_executable(commnamef commnamef.f)
 
- # target_link_libraries(commerrf  simgrid)
-  target_link_libraries(commnamef  simgrid)
+ # target_link_libraries(commerrf simgrid mtest_f77)
+  target_link_libraries(commnamef simgrid mtest_f77)
 
 endif()
 
index 0b7c836..3ea4f69 100644 (file)
@@ -14,29 +14,29 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
 
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY)
 
-  add_executable(allctypesf allctypesf.f ../util/mtestf.f)
-  add_executable(gaddressf gaddressf.f ../util/mtestf.f)
-  add_executable(hindex1f hindex1f.f ../util/mtestf.f)
-  add_executable(hindexed_blockf hindexed_blockf.f ../util/mtestf.f)
-  add_executable(packef packef.f ../util/mtestf.f)
-  add_executable(typecntsf typecntsf.f ../util/mtestf.f)
-  add_executable(typem2f typem2f.f ../util/mtestf.f)
-  add_executable(typename3f typename3f.f ../util/mtestf.f)
-  add_executable(typenamef typenamef.f ../util/mtestf.f)
-  add_executable(typesnamef typesnamef.f ../util/mtestf.f)
-  add_executable(typesubf typesubf.f ../util/mtestf.f)
+  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)
-  target_link_libraries(gaddressf  simgrid)
-  target_link_libraries(hindex1f  simgrid)
-  target_link_libraries(hindexed_blockf  simgrid)
-  target_link_libraries(packef  simgrid)
-  target_link_libraries(typecntsf  simgrid)
-  target_link_libraries(typem2f  simgrid)
-  target_link_libraries(typename3f  simgrid)
-  target_link_libraries(typenamef  simgrid)
-  target_link_libraries(typesnamef  simgrid)
-  target_link_libraries(typesubf  simgrid)
+  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)
 
 endif()
 
@@ -71,6 +71,5 @@ set(bin_files
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf.f
   PARENT_SCOPE
   )
index 9a0a418..cf6b636 100644 (file)
@@ -12,15 +12,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(add1size add1size.h ../util/mtestf.f)
-#  add_executable(allocmemf allocmemf.f ../util/mtestf.f)
-#  add_executable(c2f2cf c2f2cf.f c2f2c.c ../util/mtestf.f)
-#  add_executable(ctypesinf ctypesinf.f ctypesfromc.c ../util/mtestf.f)
+#  add_executable(allocmemf allocmemf.f)
+#  add_executable(c2f2cf c2f2cf.f c2f2c.c)
+#  add_executable(ctypesinf ctypesinf.f ctypesfromc.c)
 
-  target_link_libraries(add1size  simgrid)
-#  target_link_libraries(allocmemf  simgrid)
-#  target_link_libraries(c2f2cf  simgrid)
-#  target_link_libraries(ctypesinf  simgrid)
+#  target_link_libraries(allocmemf simgrid mtest_f77)
+#  target_link_libraries(c2f2cf simgrid mtest_f77)
+#  target_link_libraries(ctypesinf simgrid mtest_f77)
 
 endif()
 
index c307f82..523aa93 100644 (file)
@@ -12,8 +12,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(baseenvf baseenvf.f ../util/mtestf.f)
-  target_link_libraries(baseenvf  simgrid)
+  add_executable(baseenvf baseenvf.f)
+  target_link_libraries(baseenvf simgrid mtest_f77)
 
 endif()
 
index 7ccf420..1d62d9c 100644 (file)
@@ -13,15 +13,15 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(allpairf allpairf.f ../util/mtestf.f)
-  add_executable(greqf greqf.f dummyf.f ../util/mtestf.f)
-  #add_executable(mprobef mprobef.f ../util/mtestf.f)
-  add_executable(statusesf statusesf.f ../util/mtestf.f)
+  add_executable(allpairf allpairf.f)
+  add_executable(greqf greqf.f dummyf.f)
+  #add_executable(mprobef mprobef.f)
+  add_executable(statusesf statusesf.f)
 
-  target_link_libraries(allpairf  simgrid)
-  target_link_libraries(greqf  simgrid)
-  #target_link_libraries(mprobef  simgrid)
-  target_link_libraries(statusesf  simgrid)
+  target_link_libraries(allpairf simgrid mtest_f77)
+  target_link_libraries(greqf simgrid mtest_f77)
+  #target_link_libraries(mprobef simgrid mtest_f77)
+  target_link_libraries(statusesf simgrid mtest_f77)
 
 endif()
 
diff --git a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f0b1126
--- /dev/null
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.6)
+
+if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
+  if(WIN32)
+    set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
+  else()
+    set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
+    set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
+  endif()
+
+  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
+
+  #F77 version of the mtest library
+  add_library(mtest_f77 STATIC ../util/mtestf.f)
+endif()
index b2da152..ad40a70 100644 (file)
@@ -11,34 +11,34 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allredint8f90 allredint8f90.f90 ../util/mtestf90.f90)
-  add_executable(allredopttf90 allredopttf90.f90 ../util/mtestf90.f90)
-  add_executable(alltoallvf90 alltoallvf90.f90 ../util/mtestf90.f90)
-  add_executable(alltoallwf90 alltoallwf90.f90 ../util/mtestf90.f90)
-  add_executable(exscanf90 exscanf90.f90 ../util/mtestf90.f90)
-  add_executable(inplacef90 inplacef90.f90 ../util/mtestf90.f90)
- # add_executable(nonblockingf90 nonblockingf90.f90 ../util/mtestf90.f90)
- # add_executable(nonblocking_inpf90 nonblocking_inpf90.f90 ../util/mtestf90.f90)
-  add_executable(red_scat_blockf90 red_scat_blockf90.f90 ../util/mtestf90.f90)
-  add_executable(redscatf90 redscatf90.f90 ../util/mtestf90.f90)
-  add_executable(reducelocalf90 reducelocalf90.f90 ../util/mtestf90.f90)
-  add_executable(split_typef90 split_typef90.f90 ../util/mtestf90.f90)
-  add_executable(uallreducef90 uallreducef90.f90 ../util/mtestf90.f90)
-  add_executable(vw_inplacef90 vw_inplacef90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allredint8f90  simgrid)
-  target_link_libraries(allredopttf90  simgrid)
-  target_link_libraries(alltoallvf90  simgrid)
-  target_link_libraries(alltoallwf90  simgrid)
-  target_link_libraries(exscanf90  simgrid)
-  target_link_libraries(inplacef90  simgrid)
- # target_link_libraries(nonblockingf90  simgrid)
- # target_link_libraries(nonblocking_inpf90  simgrid)
-  target_link_libraries(red_scat_blockf90  simgrid)
-  target_link_libraries(redscatf90  simgrid)
-  target_link_libraries(reducelocalf90  simgrid)
-  target_link_libraries(split_typef90  simgrid)
-  target_link_libraries(uallreducef90  simgrid)
-  target_link_libraries(vw_inplacef90  simgrid)
+  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)
 
 endif()
 
index ca51980..2f80e40 100644 (file)
@@ -11,44 +11,44 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allctypesf90 allctypesf90.f90 ../util/mtestf90.f90)
- # add_executable(createf90 createf90.f90 ../util/mtestf90.f90)
-  add_executable(gaddressf90 gaddressf90.f90 ../util/mtestf90.f90)
- # add_executable(get_elem_d get_elem_d.f90 ../util/mtestf90.f90)
- # add_executable(get_elem_u get_elem_u.f90 ../util/mtestf90.f90)
-  add_executable(hindex1f90 hindex1f90.f90 ../util/mtestf90.f90)
-  add_executable(hindexed_blockf90 hindexed_blockf90.f90 ../util/mtestf90.f90)
-  add_executable(indtype indtype.f90 ../util/mtestf90.f90)
-  add_executable(kinds kinds.f90 ../util/mtestf90.f90)
-  add_executable(packef90 packef90.f90 ../util/mtestf90.f90)
- # add_executable(sizeof sizeof.f90 ../util/mtestf90.f90)
- # add_executable(structf structf.f90 ../util/mtestf90.f90)
- # add_executable(trf90 trf90.f90 ../util/mtestf90.f90)
-  add_executable(typecntsf90 typecntsf90.f90 ../util/mtestf90.f90)
-  add_executable(typem2f90 typem2f90.f90 ../util/mtestf90.f90)
-  add_executable(typename3f90 typename3f90.f90 ../util/mtestf90.f90)
-  add_executable(typenamef90 typenamef90.f90 ../util/mtestf90.f90)
-  add_executable(typesnamef90 typesnamef90.f90 ../util/mtestf90.f90)
-  add_executable(typesubf90 typesubf90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allctypesf90  simgrid)
- # target_link_libraries(createf90  simgrid)
-  target_link_libraries(gaddressf90  simgrid)
- # target_link_libraries(get_elem_d  simgrid)
- # target_link_libraries(get_elem_u  simgrid)
-  target_link_libraries(hindex1f90  simgrid)
-  target_link_libraries(hindexed_blockf90  simgrid)
-  target_link_libraries(indtype  simgrid)
-  target_link_libraries(kinds  simgrid)
-  target_link_libraries(packef90  simgrid)
- # target_link_libraries(sizeof  simgrid)
- # target_link_libraries(structf  simgrid)
- # target_link_libraries(trf90  simgrid)
-  target_link_libraries(typecntsf90  simgrid)
-  target_link_libraries(typem2f90  simgrid)
-  target_link_libraries(typename3f90  simgrid)
-  target_link_libraries(typenamef90  simgrid)
-  target_link_libraries(typesnamef90  simgrid)
-  target_link_libraries(typesubf90  simgrid)
+  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)
 
 endif()
 
index 3e4ec84..398f3db 100644 (file)
@@ -11,8 +11,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(baseenvf90 baseenvf90.f90 ../util/mtestf90.f90)
-  target_link_libraries(baseenvf90  simgrid)
+  add_executable(baseenvf90 baseenvf90.f90)
+  target_link_libraries(baseenvf90 simgrid mtest_f90)
 
 endif()
 
index dfed73b..45932ca 100644 (file)
@@ -11,14 +11,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allpairf90 allpairf90.f90 ../util/mtestf90.f90)
-  add_executable(greqf90 greqf90.f90 dummyf90.f90 ../util/mtestf90.f90)
-#  add_executable(mprobef90 mprobef90.f90 ../util/mtestf90.f90)
-  add_executable(statusesf90 statusesf90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allpairf90  simgrid)
-  target_link_libraries(greqf90  simgrid)
-#  target_link_libraries(mprobef90  simgrid)
-  target_link_libraries(statusesf90  simgrid)
+  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)
 
 endif()
 
diff --git a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
new file mode 100644 (file)
index 0000000..298f46d
--- /dev/null
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 2.6)
+
+if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
+  if(WIN32)
+    set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
+  else()
+    set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
+    set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
+  endif()
+
+  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+
+  #F90 version of the mtest library
+  add_library(mtest_f90 STATIC ../util/mtestf90.f90)
+
+endif()
+
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf.f
+  PARENT_SCOPE
+  )
index e67ccca..584e402 100644 (file)
@@ -12,19 +12,19 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(groupcreate groupcreate.c ../util/mtest.c)
-  add_executable(groupnullincl groupnullincl.c ../util/mtest.c)
-  add_executable(grouptest2 grouptest2.c ../util/mtest.c)
-  add_executable(grouptest grouptest.c ../util/mtest.c)
-  add_executable(gtranks gtranks.c ../util/mtest.c)
-  add_executable(gtranksperf gtranksperf.c ../util/mtest.c)
+  add_executable(groupcreate groupcreate.c)
+  add_executable(groupnullincl groupnullincl.c)
+  add_executable(grouptest2 grouptest2.c)
+  add_executable(grouptest grouptest.c)
+  add_executable(gtranks gtranks.c)
+  add_executable(gtranksperf gtranksperf.c)
 
-  target_link_libraries(groupcreate  simgrid)
-  target_link_libraries(groupnullincl  simgrid)
-  target_link_libraries(grouptest2  simgrid)
-  target_link_libraries(grouptest  simgrid)
-  target_link_libraries(gtranks  simgrid)
-  target_link_libraries(gtranksperf  simgrid)
+  target_link_libraries(groupcreate simgrid mtest_c)
+  target_link_libraries(groupnullincl simgrid mtest_c)
+  target_link_libraries(grouptest2 simgrid mtest_c)
+  target_link_libraries(grouptest simgrid mtest_c)
+  target_link_libraries(gtranks simgrid mtest_c)
+  target_link_libraries(gtranksperf simgrid mtest_c)
 
 endif()
 
index c84f088..ed591e0 100644 (file)
@@ -12,25 +12,25 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(attrself attrself.c ../util/mtest.c)
-  add_executable(exitst1 exitst1.c ../util/mtest.c)
-  add_executable(exitst2 exitst2.c ../util/mtest.c)
-  add_executable(exitst3 exitst3.c ../util/mtest.c)
-  add_executable(finalized finalized.c ../util/mtest.c)
-  add_executable(initstat initstat.c ../util/mtest.c)
-  add_executable(library_version library_version.c ../util/mtest.c)
-  add_executable(timeout timeout.c ../util/mtest.c)
-  add_executable(version version.c ../util/mtest.c)
+  add_executable(attrself attrself.c)
+  add_executable(exitst1 exitst1.c)
+  add_executable(exitst2 exitst2.c)
+  add_executable(exitst3 exitst3.c)
+  add_executable(finalized finalized.c)
+  add_executable(initstat initstat.c)
+  add_executable(library_version library_version.c)
+  add_executable(timeout timeout.c)
+  add_executable(version version.c)
 
-  target_link_libraries(attrself  simgrid)
-  target_link_libraries(exitst1  simgrid)
-  target_link_libraries(exitst2  simgrid)
-  target_link_libraries(exitst3  simgrid)
-  target_link_libraries(finalized  simgrid)
-  target_link_libraries(initstat  simgrid)
-  target_link_libraries(library_version  simgrid)
-  target_link_libraries(timeout  simgrid)
-  target_link_libraries(version  simgrid)
+  target_link_libraries(attrself simgrid mtest_c)
+  target_link_libraries(exitst1 simgrid mtest_c)
+  target_link_libraries(exitst2 simgrid mtest_c)
+  target_link_libraries(exitst3 simgrid mtest_c)
+  target_link_libraries(finalized simgrid mtest_c)
+  target_link_libraries(initstat simgrid mtest_c)
+  target_link_libraries(library_version simgrid mtest_c)
+  target_link_libraries(timeout simgrid mtest_c)
+  target_link_libraries(version simgrid mtest_c)
 
 endif()
 
index b705367..b651cdb 100644 (file)
@@ -12,79 +12,79 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(anyall anyall.c ../util/mtest.c)
-  add_executable(bottom bottom.c ../util/mtest.c)
-  add_executable(bsend1 bsend1.c ../util/mtest.c)
-  add_executable(bsend2 bsend2.c ../util/mtest.c)
-  add_executable(bsend3 bsend3.c ../util/mtest.c)
-  add_executable(bsend4 bsend4.c ../util/mtest.c)
-  add_executable(bsend5 bsend5.c ../util/mtest.c)
-  add_executable(bsendalign bsendalign.c ../util/mtest.c)
-  add_executable(bsendfrag bsendfrag.c ../util/mtest.c)
-  add_executable(bsendpending bsendpending.c ../util/mtest.c)
-  add_executable(cancelrecv cancelrecv.c ../util/mtest.c)
-  add_executable(eagerdt eagerdt.c ../util/mtest.c)
-  add_executable(greq1 greq1.c ../util/mtest.c)
-  add_executable(icsend icsend.c ../util/mtest.c)
-  add_executable(inactivereq inactivereq.c ../util/mtest.c)
-  add_executable(isendself isendself.c ../util/mtest.c)
-  add_executable(isendselfprobe isendselfprobe.c ../util/mtest.c)
-  add_executable(large_message large_message.c ../util/mtest.c)
-  add_executable(mprobe mprobe.c ../util/mtest.c)
-  add_executable(pingping pingping.c ../util/mtest.c)
-  add_executable(probenull probenull.c ../util/mtest.c)
-  add_executable(probe-unexp probe-unexp.c ../util/mtest.c)
-  add_executable(pscancel pscancel.c ../util/mtest.c)
-  add_executable(rcancel rcancel.c ../util/mtest.c)
-  add_executable(rqfreeb rqfreeb.c ../util/mtest.c)
-  add_executable(rqstatus rqstatus.c ../util/mtest.c)
-  add_executable(scancel2 scancel2.c ../util/mtest.c)
-  add_executable(scancel scancel.c ../util/mtest.c)
-  add_executable(sendall sendall.c ../util/mtest.c)
-  add_executable(sendflood sendflood.c ../util/mtest.c)
-  add_executable(sendrecv1 sendrecv1.c ../util/mtest.c)
-  add_executable(sendrecv2 sendrecv2.c ../util/mtest.c)
-  add_executable(sendrecv3 sendrecv3.c ../util/mtest.c)
-  add_executable(sendself sendself.c ../util/mtest.c)
-  add_executable(waitany-null waitany-null.c ../util/mtest.c)
-  add_executable(waittestnull waittestnull.c ../util/mtest.c)
+  add_executable(anyall anyall.c)
+  add_executable(bottom bottom.c)
+  add_executable(bsend1 bsend1.c)
+  add_executable(bsend2 bsend2.c)
+  add_executable(bsend3 bsend3.c)
+  add_executable(bsend4 bsend4.c)
+  add_executable(bsend5 bsend5.c)
+  add_executable(bsendalign bsendalign.c)
+  add_executable(bsendfrag bsendfrag.c)
+  add_executable(bsendpending bsendpending.c)
+  add_executable(cancelrecv cancelrecv.c)
+  add_executable(eagerdt eagerdt.c)
+  add_executable(greq1 greq1.c)
+  add_executable(icsend icsend.c)
+  add_executable(inactivereq inactivereq.c)
+  add_executable(isendself isendself.c)
+  add_executable(isendselfprobe isendselfprobe.c)
+  add_executable(large_message large_message.c)
+  add_executable(mprobe mprobe.c)
+  add_executable(pingping pingping.c)
+  add_executable(probenull probenull.c)
+  add_executable(probe-unexp probe-unexp.c)
+  add_executable(pscancel pscancel.c)
+  add_executable(rcancel rcancel.c)
+  add_executable(rqfreeb rqfreeb.c)
+  add_executable(rqstatus rqstatus.c)
+  add_executable(scancel2 scancel2.c)
+  add_executable(scancel scancel.c)
+  add_executable(sendall sendall.c)
+  add_executable(sendflood sendflood.c)
+  add_executable(sendrecv1 sendrecv1.c)
+  add_executable(sendrecv2 sendrecv2.c)
+  add_executable(sendrecv3 sendrecv3.c)
+  add_executable(sendself sendself.c)
+  add_executable(waitany-null waitany-null.c)
+  add_executable(waittestnull waittestnull.c)
 
-  target_link_libraries(anyall  simgrid)
-  target_link_libraries(bottom  simgrid)
-  target_link_libraries(bsend1  simgrid)
-  target_link_libraries(bsend2  simgrid)
-  target_link_libraries(bsend3  simgrid)
-  target_link_libraries(bsend4  simgrid)
-  target_link_libraries(bsend5  simgrid)
-  target_link_libraries(bsendalign  simgrid)
-  target_link_libraries(bsendfrag  simgrid)
-  target_link_libraries(bsendpending  simgrid)
-  target_link_libraries(cancelrecv  simgrid)
-  target_link_libraries(eagerdt  simgrid)
-  target_link_libraries(greq1  simgrid)
-  target_link_libraries(icsend  simgrid)
-  target_link_libraries(inactivereq  simgrid)
-  target_link_libraries(isendself  simgrid)
-  target_link_libraries(isendselfprobe  simgrid)
-  target_link_libraries(large_message  simgrid)
-  target_link_libraries(mprobe  simgrid)
-  target_link_libraries(pingping  simgrid)
-  target_link_libraries(probenull  simgrid)
-  target_link_libraries(probe-unexp  simgrid)
-  target_link_libraries(pscancel  simgrid)
-  target_link_libraries(rcancel  simgrid)
-  target_link_libraries(rqfreeb  simgrid)
-  target_link_libraries(rqstatus  simgrid)
-  target_link_libraries(scancel2  simgrid)
-  target_link_libraries(scancel  simgrid)
-  target_link_libraries(sendall  simgrid)
-  target_link_libraries(sendflood  simgrid)
-  target_link_libraries(sendrecv1  simgrid)
-  target_link_libraries(sendrecv2  simgrid)
-  target_link_libraries(sendrecv3  simgrid)
-  target_link_libraries(sendself  simgrid)
-  target_link_libraries(waitany-null  simgrid)
-  target_link_libraries(waittestnull  simgrid)
+  target_link_libraries(anyall simgrid mtest_c)
+  target_link_libraries(bottom simgrid mtest_c)
+  target_link_libraries(bsend1 simgrid mtest_c)
+  target_link_libraries(bsend2 simgrid mtest_c)
+  target_link_libraries(bsend3 simgrid mtest_c)
+  target_link_libraries(bsend4 simgrid mtest_c)
+  target_link_libraries(bsend5 simgrid mtest_c)
+  target_link_libraries(bsendalign simgrid mtest_c)
+  target_link_libraries(bsendfrag simgrid mtest_c)
+  target_link_libraries(bsendpending simgrid mtest_c)
+  target_link_libraries(cancelrecv simgrid mtest_c)
+  target_link_libraries(eagerdt simgrid mtest_c)
+  target_link_libraries(greq1 simgrid mtest_c)
+  target_link_libraries(icsend simgrid mtest_c)
+  target_link_libraries(inactivereq simgrid mtest_c)
+  target_link_libraries(isendself simgrid mtest_c)
+  target_link_libraries(isendselfprobe simgrid mtest_c)
+  target_link_libraries(large_message simgrid mtest_c)
+  target_link_libraries(mprobe simgrid mtest_c)
+  target_link_libraries(pingping simgrid mtest_c)
+  target_link_libraries(probenull simgrid mtest_c)
+  target_link_libraries(probe-unexp simgrid mtest_c)
+  target_link_libraries(pscancel simgrid mtest_c)
+  target_link_libraries(rcancel simgrid mtest_c)
+  target_link_libraries(rqfreeb simgrid mtest_c)
+  target_link_libraries(rqstatus simgrid mtest_c)
+  target_link_libraries(scancel2 simgrid mtest_c)
+  target_link_libraries(scancel simgrid mtest_c)
+  target_link_libraries(sendall simgrid mtest_c)
+  target_link_libraries(sendflood simgrid mtest_c)
+  target_link_libraries(sendrecv1 simgrid mtest_c)
+  target_link_libraries(sendrecv2 simgrid mtest_c)
+  target_link_libraries(sendrecv3 simgrid mtest_c)
+  target_link_libraries(sendself simgrid mtest_c)
+  target_link_libraries(waitany-null simgrid mtest_c)
+  target_link_libraries(waittestnull simgrid mtest_c)
 
 endif()