Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 18 Apr 2016 10:56:27 +0000 (12:56 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 18 Apr 2016 10:56:27 +0000 (12:56 +0200)
12 files changed:
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/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
tools/cmake/Tests.cmake

index 7f27b9f..f307b62 100644 (file)
@@ -16,6 +16,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   endforeach()
 endif()
 
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-attr-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/attr ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/attr -tests=testlist -execarg=--cfg=contexts/factory:raw)
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-attr-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
+endif()
+
 foreach(file attr2type attrend2 attrend attrerr attrerrcomm attrerrtype attrorder attrordercomm attrordertype attrt
         baseattr2 baseattrcomm fkeyval attric fkeyvalcomm fkeyvaltype keyval_double_free)
   set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
index 5357639..d6ccbc6 100644 (file)
@@ -196,10 +196,25 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(uoplong  simgrid mtest_c)
 
   set_target_properties(allred PROPERTIES COMPILE_FLAGS "-O0" LINK_FLAGS "-O0")
+
+  if(HAVE_THREAD_CONTEXTS)
+    ADD_TEST(test-smpi-mpich3-coll-thread      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:thread -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+    SET_TESTS_PROPERTIES(test-smpi-mpich3-coll-thread    PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
+  endif()
+  if(HAVE_UCONTEXT_CONTEXTS)
+    ADD_TEST(test-smpi-mpich3-coll-ompi-ucontext ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:ucontext -execarg=--cfg=smpi/coll_selector:ompi -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION} -execarg=--cfg=smpi/bcast:binomial_tree)
+    SET_TESTS_PROPERTIES(test-smpi-mpich3-coll-ompi-ucontext PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
+  endif()
+  if(HAVE_RAW_CONTEXTS)
+    ADD_TEST(test-smpi-mpich3-coll-mpich-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:mpich -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+    ADD_TEST(test-smpi-mpich3-coll-ompi-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:ompi -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION} -execarg=--cfg=smpi/bcast:binomial_tree)
+    ADD_TEST(test-smpi-mpich3-coll-mvapich2-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:mvapich2 -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+    ADD_TEST(test-smpi-mpich3-coll-impi-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:impi -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+    SET_TESTS_PROPERTIES(test-smpi-mpich3-coll-mpich-raw test-smpi-mpich3-coll-ompi-raw test-smpi-mpich3-coll-mpich-raw test-smpi-mpich3-coll-mvapich2-raw test-smpi-mpich3-coll-impi-raw  PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
+  endif()
 endif()
 
-set(examples_src
-  ${examples_src}
+set(examples_src  ${examples_src}
  ${CMAKE_CURRENT_SOURCE_DIR}/allgather2.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allgather3.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv2.c 
@@ -292,7 +307,4 @@ set(examples_src
  ${CMAKE_CURRENT_SOURCE_DIR}/scatterv.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/uoplong.c 
   PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+set(txt_files  ${txt_files}  ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)
index 3e8e1c7..2087a22 100644 (file)
@@ -18,6 +18,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   endforeach()
 endif()
 
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-comm-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/comm ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/comm -tests=testlist -execarg=--cfg=contexts/factory:raw)
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-comm-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
+endif()
+
 foreach(file cmfree cmsplit2 cmsplit cmsplit_type commcreate1 comm_create_group comm_group_half comm_group_rand 
         comm_idup comm_idup_overlap comm_idup_mul comm_info commname ctxalloc ctxsplit dup dupic dup_with_info ic1 ic2 
         iccreate icgroup icm icsplit probe-intercomm)
index d50ee7b..e8e66e3 100644 (file)
@@ -29,6 +29,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(sendrecvt4 simgrid mtest_c)
 endif()
 
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-datatype-raw   ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/datatype ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/datatype -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-datatype-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
+endif()
+
 foreach(file blockindexed-misc blockindexed-zero-count contents contigstruct contig-zero-count cxx-types darray-cyclic 
         darray-pack dataalign gaddress get-elements get-elements-pairtype getpartelm get-struct hindexed_block
         hindexed_block_contents hindexed-zeros hvecblklen indexed-misc large-count large_type large_type_sendrec lbub
index 0f890fe..b0814b8 100644 (file)
@@ -9,31 +9,21 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  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)
+  foreach(file groupcreate grouptest2 grouptest gtranks gtranksperf) #groupnullincl
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+endif()
 
-  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)
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-group-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/group ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/group -tests=testlist -execarg=--cfg=contexts/factory:raw)
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-group-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/groupcreate.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/groupnullincl.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/grouptest2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/grouptest.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/gtranks.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/gtranksperf.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file groupcreate grouptest2 grouptest gtranks gtranksperf groupnullincl)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)
+
index e2528f5..a243cc7 100644 (file)
@@ -9,37 +9,20 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(infodel infodel.c)
-  add_executable(infodup infodup.c)
-#  add_executable(infoenv infoenv.c)
-  add_executable(infomany2 infomany2.c)
-  add_executable(infomany infomany.c)
-  add_executable(infoorder infoorder.c)
-  add_executable(infotest infotest.c)
-  add_executable(infovallen infovallen.c)
+  foreach(file infodel infodup infomany2 infomany infoorder infotest infovallen) #infoenv
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+endif()
 
-  target_link_libraries(infodel simgrid mtest_c)
-  target_link_libraries(infodup simgrid mtest_c)
-#  target_link_libraries(infoenv simgrid mtest_c)
-  target_link_libraries(infomany2 simgrid mtest_c)
-  target_link_libraries(infomany simgrid mtest_c)
-  target_link_libraries(infoorder simgrid mtest_c)
-  target_link_libraries(infotest simgrid mtest_c)
-  target_link_libraries(infovallen simgrid mtest_c)
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-info-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/info ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/info -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-info-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/infodel.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infodup.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infoenv.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infomany2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infomany.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infoorder.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infotest.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/infovallen.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file infodel infodup infomany2 infomany infoorder infotest infovallen infoenv)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)
index 8a0e2d3..e42b750 100644 (file)
@@ -8,41 +8,21 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   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)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+endif()
 
-#  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 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)
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-init-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/init ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init -tests=testlist -execarg=--cfg=contexts/factory:raw)
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-init-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/attrself.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/exitst1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/exitst2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/exitst3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/finalized.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/initstat.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/library_version.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/timeout.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/version.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file attrself exitst1 exitst2 exitst3 finalized initstat library_version timeout version)
+  set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src ${examples_src}                                         PARENT_SCOPE)
+set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist   PARENT_SCOPE)
index 60ab82a..82c47b3 100644 (file)
@@ -9,48 +9,22 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(commcreatep commcreatep.c)
-#  add_executable(dtpack dtpack.c)
-#  add_executable(indexperf indexperf.c)
-#  add_executable(manyrma manyrma.c)
-#  add_executable(nestvec2 nestvec2.c)
-#  add_executable(nestvec nestvec.c)
-  add_executable(non_zero_root non_zero_root.c)
-  add_executable(sendrecvl sendrecvl.c)
-  add_executable(timer timer.c)
-  add_executable(transp-datatype transp-datatype.c)
-  add_executable(twovec twovec.c)
+  foreach(file commcreatep non_zero_root sendrecvl timer transp-datatype twovec)
+    #not compiled files  dtpack indexperf manyrma nestvec2 nestvec
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+endif()
 
-  target_link_libraries(commcreatep simgrid mtest_c)
-#  target_link_libraries(dtpack simgrid mtest_c)
-#  target_link_libraries(indexperf simgrid mtest_c)
-#  target_link_libraries(manyrma simgrid mtest_c)
-#  target_link_libraries(nestvec2 simgrid mtest_c)
-#  target_link_libraries(nestvec simgrid mtest_c)
-  target_link_libraries(non_zero_root simgrid mtest_c)
-  target_link_libraries(sendrecvl simgrid mtest_c)
-  target_link_libraries(timer simgrid mtest_c)
-  target_link_libraries(transp-datatype simgrid mtest_c)
-  target_link_libraries(twovec simgrid mtest_c)
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-perf-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/perf ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/perf -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/running_power:-1)
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/allredtrace.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/commcreatep.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/dtpack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/indexperf.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/manyrma.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/nestvec2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/nestvec.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/non_zero_root.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendrecvl.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/timer.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transp-datatype.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/twovec.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file allredtrace commcreatep non_zero_root sendrecvl timer transp-datatype twovec dtpack indexperf manyrma 
+        nestvec2 nestvec)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README 
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)
index 3fe7256..d32826d 100644 (file)
@@ -9,127 +9,26 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(anyall anyall.c)
-  add_executable(bottom bottom.c)
-#  add_executable(big_count_status big_count_status.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(issendselfcancel issendselfcancel.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)
+  foreach(file anyall bottom eagerdt inactivereq isendself isendselfprobe issendselfcancel mprobe pingping probenull
+          probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull)
+    # not compiled files: big_count_status bsend1 bsend2 bsend3 bsend4 bsend5 bsendalign bsendfrag bsendpending
+    # cancelrecv greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+endif()
 
-  target_link_libraries(anyall simgrid mtest_c)
-#  target_link_libraries(big_count_status 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(issendselfcancel 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)
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-pt2pt-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/pt2pt ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/pt2pt -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-pt2pt-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/anyall.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/big_count_status.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bottom.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsend1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsend2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsend3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsend4.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsend5.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsendalign.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsendfrag.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/bsendpending.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/cancelrecv.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/eagerdt.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/greq1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/icsend.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/inactivereq.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/isendself.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/isendselfprobe.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/issendselfcancel.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/large_message.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/mprobe.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/pingping.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/probenull.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/probe-unexp.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/pscancel.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/rcancel.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/rqfreeb.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/rqstatus.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/scancel2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/scancel.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendall.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendflood.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sendself.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/waitany-null.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/waittestnull.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file anyall bottom eagerdt inactivereq isendself isendselfprobe issendselfcancel mprobe pingping probenull
+          probe-unexp sendall sendflood sendrecv1 sendrecv2 sendrecv3 waitany-null waittestnull
+          big_count_status bsend1 bsend2 bsend3 bsend4 bsend5 bsendalign bsendfrag bsendpending
+          cancelrecv greq1 icsend large_message pscancel rcancel rqfreeb rqstatus scancel2 scancel sendself)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)
index ae1f882..8073707 100644 (file)
@@ -10,396 +10,47 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(accfence1 accfence1.c)
-  add_executable(accfence2_am accfence2_am.c)
-  add_executable(accfence2 accfence2.c)
-  add_executable(accpscw1 accpscw1.c)
-#  add_executable(acc-loc acc-loc.c)
-#  add_executable(adlb_mimic1 adlb_mimic1.c)
-  add_executable(allocmem allocmem.c)
-#  add_executable(attrorderwin attrorderwin.c)
-#  add_executable(badrma badrma.c)
-#  add_executable(baseattrwin baseattrwin.c)
-#  add_executable(compare_and_swap compare_and_swap.c)
-#  add_executable(contention_put contention_put.c)
-#  add_executable(contention_putget contention_putget.c)
-#  add_executable(contig_displ contig_displ.c)
-  add_executable(epochtest epochtest.c)
-#  add_executable(fence_shm fence_shm.c)
-#  add_executable(fetchandadd_am fetchandadd_am.c)
-#  add_executable(fetchandadd fetchandadd.c)
-#  add_executable(fetchandadd_tree_am fetchandadd_tree_am.c)
-#  add_executable(fetchandadd_tree fetchandadd_tree.c)
-#  add_executable(fetch_and_op fetch_and_op.c)
-#  add_executable(fkeyvalwin fkeyvalwin.c)
-#  add_executable(flush flush.c)
-#  add_executable(get_acc_local get_acc_local.c)
-#  add_executable(get_accumulate get_accumulate.c)
-  add_executable(getfence1 getfence1.c)
-  add_executable(getgroup getgroup.c)
-#  add_executable(ircpi ircpi.c)
-#  add_executable(linked_list_bench_lock_all linked_list_bench_lock_all.c)
-#  add_executable(linked_list_bench_lock_excl linked_list_bench_lock_excl.c)
-#  add_executable(linked_list_bench_lock_shr linked_list_bench_lock_shr.c)
-#  add_executable(linked_list linked_list.c)
-#  add_executable(linked_list_fop linked_list_fop.c)
-#  add_executable(linked_list_lockall linked_list_lockall.c)
-#  add_executable(lockcontention2 lockcontention2.c)
-#  add_executable(lockcontention3 lockcontention3.c)
-#  add_executable(lockcontention lockcontention.c)
-#  add_executable(locknull locknull.c)
-#  add_executable(lockopts lockopts.c)
-#  add_executable(manyrma2 manyrma2.c)
-  add_executable(manyrma3 manyrma3.c)
-#  add_executable(mcs-mutex mcs-mutex.c)
-#  add_executable(mixedsync mixedsync.c)
-#  add_executable(mutex_bench mutex_bench.c)
-  add_executable(nullpscw nullpscw.c)
-#  add_executable(pscw_ordering pscw_ordering.c)
-#  add_executable(put_base put_base.c)
-#  add_executable(put_bottom put_bottom.c)
-  add_executable(putfence1 putfence1.c)
-  add_executable(putfidx putfidx.c)
-  add_executable(putpscw1 putpscw1.c)
-#  add_executable(req_example req_example.c)
-#  add_executable(reqops reqops.c)
-#  add_executable(rmanull rmanull.c)
-#  add_executable(rmazero rmazero.c)
-#  add_executable(rma-contig rma-contig.c)
-#  add_executable(selfrma selfrma.c)
-#  add_executable(strided_acc_indexed strided_acc_indexed.c)
-#  add_executable(strided_acc_onelock strided_acc_onelock.c)
-#  add_executable(strided_acc_subarray strided_acc_subarray.c)
-#  add_executable(strided_getacc_indexed strided_getacc_indexed.c)
-#  add_executable(strided_getacc_indexed_shared strided_getacc_indexed_shared.c)
-#  add_executable(strided_get_indexed strided_get_indexed.c)
-#  add_executable(strided_putget_indexed strided_putget_indexed.c)
-#  add_executable(strided_putget_indexed_shared strided_putget_indexed_shared.c)
-  add_executable(test1_am test1_am.c)
-  add_executable(test1 test1.c)
-  add_executable(test1_dt test1_dt.c)
-  add_executable(test2_am test2_am.c)
-  add_executable(test2 test2.c)
-#  add_executable(test3_am test3_am.c)
-  add_executable(test3 test3.c)
-#  add_executable(test4_am test4_am.c)
-#  add_executable(test4 test4.c)
-  add_executable(test5_am test5_am.c)
-  add_executable(test5 test5.c)
-  add_executable(transpose1 transpose1.c)
-  add_executable(transpose2 transpose2.c)
-  add_executable(transpose3 transpose3.c)
-#  add_executable(transpose4 transpose4.c)
-#  add_executable(transpose5 transpose5.c)
-  add_executable(transpose6 transpose6.c)
-  add_executable(transpose7 transpose7.c)
-#  add_executable(wincall wincall.c)
-  add_executable(window_creation window_creation.c)
-#  add_executable(win_dynamic_acc win_dynamic_acc.c)
-#  add_executable(win_flavors win_flavors.c)
-#  add_executable(win_info win_info.c)
-#  add_executable(winname winname.c)
-#  add_executable(win_shared win_shared.c)
-#  add_executable(win_shared_noncontig win_shared_noncontig.c)
-#  add_executable(win_shared_noncontig_put win_shared_noncontig_put.c)
-#  add_executable(win_large_shm win_large_shm.c)
-#  add_executable(win_zero win_zero.c)
-#  add_executable(wintest wintest.c)
-
-  target_link_libraries(accfence1 simgrid mtest_c)
-  target_link_libraries(accfence2_am simgrid mtest_c)
-  target_link_libraries(accfence2 simgrid mtest_c)
-  target_link_libraries(accpscw1 simgrid mtest_c)
-#  target_link_libraries(acc-loc simgrid mtest_c)
-#  target_link_libraries(adlb_mimic1 simgrid mtest_c)
-  target_link_libraries(allocmem simgrid mtest_c)
-#  target_link_libraries(attrorderwin simgrid mtest_c)
-#  target_link_libraries(badrma simgrid mtest_c)
-#  target_link_libraries(baseattrwin simgrid mtest_c)
-#  target_link_libraries(compare_and_swap simgrid mtest_c)
-#  target_link_libraries(contention_put simgrid mtest_c)
-#  target_link_libraries(contention_putget simgrid mtest_c)
-#  target_link_libraries(contig_displ simgrid mtest_c)
-  target_link_libraries(epochtest simgrid mtest_c)
-#  target_link_libraries(fence_shm simgrid mtest_c)
-#  target_link_libraries(fetchandadd_am simgrid mtest_c)
-#  target_link_libraries(fetchandadd simgrid mtest_c)
-#  target_link_libraries(fetchandadd_tree_am simgrid mtest_c)
-#  target_link_libraries(fetchandadd_tree simgrid mtest_c)
-#  target_link_libraries(fetch_and_op simgrid mtest_c)
-#  target_link_libraries(fkeyvalwin simgrid mtest_c)
-#  target_link_libraries(flush simgrid mtest_c)
-#  target_link_libraries(get_acc_local simgrid mtest_c)
-#  target_link_libraries(get_accumulate simgrid mtest_c)
-  target_link_libraries(getfence1 simgrid mtest_c)
-  target_link_libraries(getgroup simgrid mtest_c)
-#  target_link_libraries(ircpi simgrid mtest_c)
-#  target_link_libraries(linked_list_bench_lock_all simgrid mtest_c)
-#  target_link_libraries(linked_list_bench_lock_excl simgrid mtest_c)
-#  target_link_libraries(linked_list_bench_lock_shr simgrid mtest_c)
-#  target_link_libraries(linked_list simgrid mtest_c)
-#  target_link_libraries(linked_list_fop simgrid mtest_c)
-#  target_link_libraries(linked_list_lockall simgrid mtest_c)
-#  target_link_libraries(lockcontention2 simgrid mtest_c)
-#  target_link_libraries(lockcontention3 simgrid mtest_c)
-#  target_link_libraries(lockcontention simgrid mtest_c)
-#  target_link_libraries(locknull simgrid mtest_c)
-#  target_link_libraries(lockopts simgrid mtest_c)
-#  target_link_libraries(manyrma2 simgrid mtest_c)
-  target_link_libraries(manyrma3 simgrid mtest_c)
-#  target_link_libraries(mcs-mutex simgrid mtest_c)
-#  target_link_libraries(mixedsync simgrid mtest_c)
-#  target_link_libraries(mutex_bench simgrid mtest_c)
-  target_link_libraries(nullpscw simgrid mtest_c)
-#  target_link_libraries(pscw_ordering simgrid mtest_c)
-#  target_link_libraries(put_base simgrid mtest_c)
-#  target_link_libraries(put_bottom simgrid mtest_c)
-  target_link_libraries(putfence1 simgrid mtest_c)
-  target_link_libraries(putfidx simgrid mtest_c)
-  target_link_libraries(putpscw1 simgrid mtest_c)
-#  target_link_libraries(req_example simgrid mtest_c)
-#  target_link_libraries(reqops simgrid mtest_c)
-#  target_link_libraries(rma-contig simgrid mtest_c)
-#  target_link_libraries(rmanull simgrid mtest_c)
-#  target_link_libraries(rmazero simgrid mtest_c)
-#  target_link_libraries(selfrma simgrid mtest_c)
-#  target_link_libraries(strided_acc_indexed simgrid mtest_c)
-#  target_link_libraries(strided_acc_onelock simgrid mtest_c)
-#  target_link_libraries(strided_acc_subarray simgrid mtest_c)
-#  target_link_libraries(strided_getacc_indexed simgrid mtest_c)
-#  target_link_libraries(strided_getacc_indexed_shared simgrid mtest_c)
-#  target_link_libraries(strided_get_indexed simgrid mtest_c)
-#  target_link_libraries(strided_putget_indexed simgrid mtest_c)
-#  target_link_libraries(strided_putget_indexed_shared simgrid mtest_c)
-  target_link_libraries(test1_am simgrid mtest_c)
-  target_link_libraries(test1 simgrid mtest_c)
-  target_link_libraries(test1_dt simgrid mtest_c)
-  target_link_libraries(test2_am simgrid mtest_c)
-  target_link_libraries(test2 simgrid mtest_c)
-#  target_link_libraries(test3_am simgrid mtest_c)
-  target_link_libraries(test3 simgrid mtest_c)
-#  target_link_libraries(test4_am simgrid mtest_c)
-#  target_link_libraries(test4 simgrid mtest_c)
-  target_link_libraries(test5_am simgrid mtest_c)
-  target_link_libraries(test5 simgrid mtest_c)
-  target_link_libraries(transpose1 simgrid mtest_c)
-  target_link_libraries(transpose2 simgrid mtest_c)
-  target_link_libraries(transpose3 simgrid mtest_c)
-#  target_link_libraries(transpose4 simgrid mtest_c)
-#  target_link_libraries(transpose5 simgrid mtest_c)
-  target_link_libraries(transpose6 simgrid mtest_c)
-  target_link_libraries(transpose7 simgrid mtest_c)
-#  target_link_libraries(wincall simgrid mtest_c)
-  target_link_libraries(window_creation simgrid mtest_c)
-#  target_link_libraries(win_dynamic_acc simgrid mtest_c)
-#  target_link_libraries(win_flavors simgrid mtest_c)
-#  target_link_libraries(win_info simgrid mtest_c)
-#  target_link_libraries(winname simgrid mtest_c)
-#  target_link_libraries(win_shared simgrid mtest_c)
-#  target_link_libraries(win_shared_noncontig simgrid mtest_c)
-#  target_link_libraries(win_shared_noncontig_put simgrid mtest_c)
-#  target_link_libraries(win_large_shm simgrid mtest_c)
-#  target_link_libraries(win_zero simgrid mtest_c)
-#  target_link_libraries(wintest simgrid mtest_c)
+  foreach(file accfence1 accfence2_am accfence2 accpscw1 allocmem epochtest getfence1 getgroup manyrma3 nullpscw
+          putfence1 putfidx putpscw1 test1_am test1 test1_dt test2_am test2 test3 test5_am test5 transpose1 transpose2
+          transpose3 transpose6 transpose7 window_creation)
+    # not compiled files: acc-loc adlb_mimic1 attrorderwin badrma baseattrwin compare_and_swap contention_put
+    # contention_putget contig_displ fence_shm fetchandadd_am fetchandadd fetchandadd_tree_am fetchandadd_tree 
+    # fetch_and_op fkeyvalwin flush get_acc_local get_accumulate ircpi linked_list_bench_lock_all 
+    # linked_list_bench_lock_excl linked_list_bench_lock_shr linked_list linked_list_fop linked_list_lockall 
+    # lockcontention2 lockcontention3 lockcontention locknull lockopts manyrma2 mcs-mutex mixedsync mutex_bench 
+    # pscw_ordering put_base put_bottom req_example reqops rmanull rmazero rma-contig selfrma strided_acc_indexed 
+    # strided_acc_onelock strided_acc_subarray strided_getacc_indexed strided_getacc_indexed_shared strided_get_indexed
+    # strided_putget_indexed strided_putget_indexed_shared test3_am test4_am test4 transpose4 transpose5 wincall 
+    # win_dynamic_acc win_flavors win_info winname win_shared win_shared_noncontig win_shared_noncontig_put 
+    # win_large_shm win_zero wintest
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+    set_target_properties(${file} PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  endforeach()
+endif()
 
- set_target_properties(accfence1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(accfence2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(accfence2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(acc-loc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(accpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(adlb_mimic1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allocmem PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(attrorderwin PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(badrma PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(baseattrwin PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(compare_and_swap PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(contention_put PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(contention_putget PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(contig_displ PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(epochtest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fence_shm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fetchandadd_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fetchandadd PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fetchandadd_tree_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fetchandadd_tree PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fetch_and_op PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(fkeyvalwin PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(flush PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(get_acc_local PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(get_accumulate PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(getfence1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(getgroup PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(ircpi PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(linked_list_bench_lock_all PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(linked_list_bench_lock_excl PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(linked_list_bench_lock_shr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(linked_list PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(linked_list_fop PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(linked_list_lockall PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(lockcontention2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(lockcontention3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(lockcontention PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(locknull PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(lockopts PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(manyrma2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(manyrma3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(mcs-mutex PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(mixedsync PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(mutex_bench PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(nullpscw PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(pscw_ordering PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(put_base PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(put_bottom PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(putfence1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(putfidx PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(putpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(req_example PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(reqops PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(rmanull PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(rmazero PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(rma-contig PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(selfrma PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_acc_indexed PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_acc_onelock PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_acc_subarray PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_getacc_indexed PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_getacc_indexed_shared PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_get_indexed PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_putget_indexed PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(strided_putget_indexed_shared PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test1_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test1_dt PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test3_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test4_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test5_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(test5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(transpose1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(transpose2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(transpose3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(transpose4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(transpose5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(transpose6 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(transpose7 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(wincall PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(window_creation PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_dynamic_acc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_flavors PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_info PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(winname PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_shared PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_shared_noncontig PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_shared_noncontig_put PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_large_shm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(win_zero PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(wintest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-rma-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/rma ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/rma -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-rma-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/accfence1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/accfence2_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/accfence2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/acc-loc.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/accpscw1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/adlb_mimic1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/allocmem.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/attrorderwin.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/badrma.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/baseattrwin.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/compare_and_swap.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/contention_put.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/contention_putget.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/contig_displ.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/epochtest.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fence_shm.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fetchandadd_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fetchandadd.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fetchandadd_tree_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fetchandadd_tree.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fetch_and_op.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/fkeyvalwin.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/flush.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/get_acc_local.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/get_accumulate.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/getfence1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/getgroup.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/ircpi.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/linked_list_bench_lock_all.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/linked_list_bench_lock_excl.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/linked_list_bench_lock_shr.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/linked_list.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/linked_list_fop.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/linked_list_lockall.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/lockcontention2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/lockcontention3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/lockcontention.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/locknull.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/lockopts.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/manyrma2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/manyrma3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/mcs-mutex.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/mixedsync.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/mutex_bench.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/nullpscw.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/pscw_ordering.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/put_base.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/put_bottom.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/putfence1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/putfidx.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/putpscw1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/req_example.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/reqops.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/rmanull.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/rmazero.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/rma-contig.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/selfrma.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_acc_indexed.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_acc_onelock.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_acc_subarray.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_getacc_indexed.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_getacc_indexed_shared.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_get_indexed.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_putget_indexed.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/strided_putget_indexed_shared.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test1_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test1_dt.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test2_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test3_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test4_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test4.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test5_am.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/test5.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose3.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose4.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose5.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose6.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose7.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/wincall.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/window_creation.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_dynamic_acc.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_flavors.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_info.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_large_shm.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_zero.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/winname.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_shared.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_shared_noncontig.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/win_shared_noncontig_put.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/wintest.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/mcs-mutex.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/squelch.h
-  PARENT_SCOPE)
+foreach(file accfence1 accfence2_am accfence2 accpscw1 allocmem epochtest getfence1 getgroup manyrma3 nullpscw
+          putfence1 putfidx putpscw1 test1_am test1 test1_dt test2_am test2 test3 test5_am test5 transpose1 transpose2
+          transpose3 transpose6 transpose7 window_creation
+          acc-loc adlb_mimic1 attrorderwin badrma baseattrwin compare_and_swap contention_put contention_putget 
+          contig_displ fence_shm fetchandadd_am fetchandadd fetchandadd_tree_am fetchandadd_tree fetch_and_op
+          fkeyvalwin flush get_acc_local get_accumulate ircpi linked_list_bench_lock_all linked_list_bench_lock_excl
+          linked_list_bench_lock_shr linked_list linked_list_fop linked_list_lockall lockcontention2 lockcontention3 
+          lockcontention locknull lockopts manyrma2 mcs-mutex mixedsync mutex_bench pscw_ordering put_base put_bottom 
+          req_example reqops rmanull rmazero rma-contig selfrma strided_acc_indexed strided_acc_onelock 
+          strided_acc_subarray strided_getacc_indexed strided_getacc_indexed_shared strided_get_indexed 
+          strided_putget_indexed strided_putget_indexed_shared test3_am test4_am test4 transpose4 transpose5 wincall 
+          win_dynamic_acc win_flavors win_info winname win_shared win_shared_noncontig win_shared_noncontig_put 
+          win_large_shm win_zero wintest)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src  ${examples_src}                                           PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mcs-mutex.h
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/squelch.h    PARENT_SCOPE)
index 3677016..ca680f9 100644 (file)
@@ -9,65 +9,23 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-add_executable(cartcreates cartcreates.c)
-#add_executable(cartmap1 cartmap1.c)
-add_executable(cartshift1 cartshift1.c)
-add_executable(cartsuball cartsuball.c)
-add_executable(cartzero cartzero.c)
-#  add_executable(dgraph_unwgt dgraph_unwgt.c)
-#add_executable(dims1 dims1.c)
-#add_executable(dims2 dims2.c)
-#add_executable(dims3 dims3.c)
-#add_executable(dims4 dims4.c)
-#  add_executable(distgraph1 distgraph1.c)
-#  add_executable(graphcr2 graphcr2.c)
-#  add_executable(graphcr graphcr.c)
-#  add_executable(graphmap1 graphmap1.c)
-#add_executable(neighb_coll neighb_coll.c)
-#  add_executable(topodup topodup.c)
-#add_executable(topotest topotest.c)
+  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)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+endif()
+
+foreach(file cartcreates cartshift1 cartsuball cartzero cartmap1 dgraph_unwgt dims1 dims2 dims3 dims4 distgraph1 
+        graphcr2 graphcr graphmap1 neighb_coll topodup topotest)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
 
-target_link_libraries(cartcreates simgrid mtest_c)
-# target_link_libraries(cartmap1 simgrid mtest_c)
-target_link_libraries(cartshift1 simgrid mtest_c)
-target_link_libraries(cartsuball simgrid mtest_c)
-target_link_libraries(cartzero simgrid mtest_c)
-#  target_link_libraries(dgraph_unwgt simgrid mtest_c)
-#  target_link_libraries(dims1 simgrid mtest_c)
-#  target_link_libraries(dims2 simgrid mtest_c)
-#  target_link_libraries(dims3 simgrid mtest_c)
-#  target_link_libraries(dims4 simgrid mtest_c)
-#  target_link_libraries(distgraph1 simgrid mtest_c)
-#  target_link_libraries(graphcr2 simgrid mtest_c)
-#  target_link_libraries(graphcr simgrid mtest_c)
-#  target_link_libraries(graphmap1 simgrid mtest_c)
-#  target_link_libraries(neighb_coll simgrid mtest_c)
-#  target_link_libraries(topodup simgrid mtest_c)
-#  target_link_libraries(topotest simgrid mtest_c)
+if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
+  ADD_TEST(test-smpi-mpich3-topo-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/topo ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/topo -tests=testlist -execarg=--cfg=contexts/factory:raw)
+  SET_TESTS_PROPERTIES(test-smpi-mpich3-topo-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
 endif()
 
-set(examples_src
- ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/cartcreates.c
- ${CMAKE_CURRENT_SOURCE_DIR}/cartmap1.c
- ${CMAKE_CURRENT_SOURCE_DIR}/cartshift1.c
- ${CMAKE_CURRENT_SOURCE_DIR}/cartsuball.c
- ${CMAKE_CURRENT_SOURCE_DIR}/cartzero.c
- ${CMAKE_CURRENT_SOURCE_DIR}/dgraph_unwgt.c
- ${CMAKE_CURRENT_SOURCE_DIR}/dims1.c
- ${CMAKE_CURRENT_SOURCE_DIR}/dims2.c
- ${CMAKE_CURRENT_SOURCE_DIR}/dims3.c
- ${CMAKE_CURRENT_SOURCE_DIR}/dims4.c
- ${CMAKE_CURRENT_SOURCE_DIR}/distgraph1.c
- ${CMAKE_CURRENT_SOURCE_DIR}/graphcr2.c
- ${CMAKE_CURRENT_SOURCE_DIR}/graphcr.c
- ${CMAKE_CURRENT_SOURCE_DIR}/graphmap1.c
- ${CMAKE_CURRENT_SOURCE_DIR}/neighb_coll.c
- ${CMAKE_CURRENT_SOURCE_DIR}/testlist
- ${CMAKE_CURRENT_SOURCE_DIR}/topodup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/topotest.c
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)
index 1726390..f0fbff8 100644 (file)
@@ -11,7 +11,6 @@ IF(CMAKE_HOST_WIN32)
   SET(TESH_OPTION ${TESH_OPTION} --timeout 50)
 ENDIF()
 
-
 IF(enable_memcheck)
   INCLUDE(FindValgrind)
 ENDIF()
@@ -66,39 +65,11 @@ ENDMACRO()
   ENDIF()
 
   ### SMPI ###
-  IF(enable_smpi_MPICH3_testsuite)
-    IF(HAVE_THREAD_CONTEXTS)
-      ADD_TEST(test-smpi-mpich3-coll-thread      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:thread -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      SET_TESTS_PROPERTIES(test-smpi-mpich3-coll-thread    PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
-    ENDIF()
-    IF(HAVE_UCONTEXT_CONTEXTS)
-      ADD_TEST(test-smpi-mpich3-coll-ompi-ucontext ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:ucontext -execarg=--cfg=smpi/coll_selector:ompi -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION} -execarg=--cfg=smpi/bcast:binomial_tree)
-      SET_TESTS_PROPERTIES(test-smpi-mpich3-coll-ompi-ucontext PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
-    ENDIF()
-    IF(HAVE_RAW_CONTEXTS)
-      ADD_TEST(test-smpi-mpich3-coll-mpich-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:mpich -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      ADD_TEST(test-smpi-mpich3-coll-ompi-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:ompi -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION} -execarg=--cfg=smpi/bcast:binomial_tree)
-      ADD_TEST(test-smpi-mpich3-coll-mvapich2-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:mvapich2 -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      ADD_TEST(test-smpi-mpich3-coll-impi-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/coll_selector:impi -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      SET_TESTS_PROPERTIES(test-smpi-mpich3-coll-mpich-raw test-smpi-mpich3-coll-ompi-raw test-smpi-mpich3-coll-mpich-raw test-smpi-mpich3-coll-mvapich2-raw test-smpi-mpich3-coll-impi-raw  PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
-      ADD_TEST(test-smpi-mpich3-attr-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/attr ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/attr -tests=testlist -execarg=--cfg=contexts/factory:raw)
-      ADD_TEST(test-smpi-mpich3-comm-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/comm ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/comm -tests=testlist -execarg=--cfg=contexts/factory:raw)
-      ADD_TEST(test-smpi-mpich3-init-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/init ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init -tests=testlist -execarg=--cfg=contexts/factory:raw)
-      ADD_TEST(test-smpi-mpich3-datatype-raw   ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/datatype ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/datatype -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      ADD_TEST(test-smpi-mpich3-group-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/group ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/group -tests=testlist -execarg=--cfg=contexts/factory:raw)
-      ADD_TEST(test-smpi-mpich3-pt2pt-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/pt2pt ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/pt2pt -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      ADD_TEST(test-smpi-mpich3-topo-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/topo ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/topo -tests=testlist -execarg=--cfg=contexts/factory:raw)
-      ADD_TEST(test-smpi-mpich3-rma-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/rma ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/rma -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      ADD_TEST(test-smpi-mpich3-info-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/info ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/info -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
-      ADD_TEST(test-smpi-mpich3-perf-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/perf ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/perf -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/running_power:-1)
-      SET_TESTS_PROPERTIES(test-smpi-mpich3-attr-raw test-smpi-mpich3-comm-raw test-smpi-mpich3-init-raw test-smpi-mpich3-datatype-raw test-smpi-mpich3-group-raw test-smpi-mpich3-pt2pt-raw test-smpi-mpich3-topo-raw test-smpi-mpich3-rma-raw test-smpi-mpich3-info-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
-    ENDIF()
-    IF(SMPI_FORTRAN AND HAVE_THREAD_CONTEXTS)
+  IF(enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN AND HAVE_THREAD_CONTEXTS)
       ADD_TEST(test-smpi-mpich3-thread-f77     ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/f77/ ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/ -tests=testlist -execarg=--cfg=contexts/stack_size:8000 -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
       SET_TESTS_PROPERTIES(test-smpi-mpich3-thread-f77 PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
       ADD_TEST(test-smpi-mpich3-thread-f90     ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/f90/ ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/ -tests=testlist -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
       SET_TESTS_PROPERTIES(test-smpi-mpich3-thread-f90 PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
-    ENDIF()
   ENDIF()
 
   ## BINDINGS ##