Activate some OP tests, and add some optional (stupid) operations

[simgrid.git] / teshsuite / smpi / mpich3-test / coll / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
index 1c28008..d85adf5 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
@@ -9,44 +9,29 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
  
-  foreach(test allgather2 allgather3 allgather_struct 
-               allgatherv2 allgatherv3
-              allred2 allred3 allred4 allred5 allred6 allredmany
-              alltoall1 alltoallv0 alltoallv
-            # alltoallw1 alltoallw2 alltoallw_zeros
-              bcasttest bcastzerotype 
-              coll2 coll3 coll4 coll5 coll6 coll7 coll8 coll9 coll10 coll11 coll12 coll13
-              exscan exscan2 
-              gather gather2 gather_big
-            # iallred ibarrier icallgather icallgatherv icallreduce
-             # icalltoall icalltoallv icalltoallw icbarrier icbcast
-            # icgather icgatherv icreduce icscatter icscatterv
-              longuser
-            # nonblocking2 nonblocking3 nonblocking
-            # opband opbor opbxor opland oplor oplxor opmax opmaxloc
-             # opmin opminloc opprod opsum
-              op_commutative
-              red3 red4 redscat2 redscat3 redscatbkinter redscatblk3
-               redscat red_scat_block red_scat_block2
-            # redscatinter
-              reduce_local
-              scantst scatter2 scatter3 scattern scatterv
-            # uoplong
-              )
+  foreach(test allgather2 allgather3 allgather_struct allgatherv2 allgatherv3
+          allred2 allred3 allred4 allred5 allred6 allredmany alltoall1 
+          alltoallv0 alltoallv alltoallw1 alltoallw2 alltoallw_zeros
+          bcasttest bcastzerotype coll2 coll3 coll4 coll5 coll6 coll7 coll8
+          coll9 coll10 coll11 coll12 coll13 exscan exscan2 gather gather2 
+          gather_big ibarrier longuser nonblocking nonblocking2 iallred
+        # icallgather icallgatherv icallreduce
+        # icalltoall icalltoallv icalltoallw icbarrier icbcast
+        # icgather icgatherv icreduce icscatter icscatterv
+         opband opbor opbxor opland oplor oplxor opmax opmaxloc
+         opmin opminloc opprod opsum 
+         #nonblocking3
+          op_commutative red3 red4 redscat2 redscat3 redscatbkinter redscatblk3
+          redscat red_scat_block red_scat_block2 allgatherv4 allred
+        # redscatinter
+          reduce_local scantst scatter2 scatter3 scattern scatterv
+         uoplong
+         )
     add_executable(${test} EXCLUDE_FROM_ALL ${test}.c)
     add_dependencies(tests ${test})
     target_link_libraries(${test} simgrid mtest_c)
   endforeach()
 
-  foreach(test allgatherv4 allred)
-    if(HAVE_PRIVATIZATION)
-      add_executable(${test} EXCLUDE_FROM_ALL ${test}.c)
-    else()
-      add_executable(${test} EXCLUDE_FROM_ALL ${test}_manual.c)
-    endif()
-    add_dependencies(tests ${test})
-    target_link_libraries(${test} simgrid mtest_c)
-  endforeach()
   set_target_properties(allred PROPERTIES COMPILE_FLAGS "-O0" LINK_FLAGS "-O0")
 
   foreach(test bcast_full bcast_min_datatypes bcast_comm_world)
@@ -105,14 +90,12 @@ set(examples_src  ${examples_src}
  ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv2.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv3.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv4.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/allgatherv4_manual.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allred2.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allred3.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allred4.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allred5.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allred6.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allred.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/allred_manual.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/allredmany.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall1.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv0.c