add tests for scatter

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 48724f4..a6c809c 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -418,6 +418,10 @@ if(NOT enable_memcheck)
     FOREACH (REDUCE_SCATTER_COLL default  ompi ompi_basic_recursivehalving ompi_ring)
         ADD_TEST(smpi-reduce_scatter-coll-${REDUCE_SCATTER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/reduce_scatter:${REDUCE_SCATTER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce_scatter_coll.tesh)
     ENDFOREACH()
     FOREACH (REDUCE_SCATTER_COLL default  ompi ompi_basic_recursivehalving ompi_ring)
         ADD_TEST(smpi-reduce_scatter-coll-${REDUCE_SCATTER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/reduce_scatter:${REDUCE_SCATTER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce_scatter_coll.tesh)
     ENDFOREACH()

+
+    FOREACH (SCATTER_COLL default  ompi ompi_basic_linear ompi_binomial)
+        ADD_TEST(smpi-scatter-coll-${SCATTER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/scatter:${SCATTER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/scatter_coll.tesh)
+    ENDFOREACH()

   endif()
 
   # END TESH TESTS
   endif()
 
   # END TESH TESTS

diff --git a/teshsuite/smpi/scatter_coll.tesh b/teshsuite/smpi/scatter_coll.tesh
new file mode 100644 (file)
index 0000000..f5d2c79
--- /dev/null
+++ b/teshsuite/smpi/scatter_coll.tesh
@@ -0,0 +1,58 @@
+# Smpi  scatter collectives tests
+! setenv LD_LIBRARY_PATH=../../lib
+! output sort
+
+p Test scatter
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ./scatter 
+>      [0] ok.
+>      [0] ok.
+>      [10] ok.
+>      [10] ok.
+>      [11] ok.
+>      [11] ok.
+>      [12] ok.
+>      [12] ok.
+>      [13] ok.
+>      [13] ok.
+>      [14] ok.
+>      [14] ok.
+>      [15] ok.
+>      [15] ok.
+>      [1] ok.
+>      [1] ok.
+>      [2] ok.
+>      [2] ok.
+>      [3] ok.
+>      [3] ok.
+>      [4] ok.
+>      [4] ok.
+>      [5] ok.
+>      [5] ok.
+>      [6] ok.
+>      [6] ok.
+>      [7] ok.
+>      [7] ok.
+>      [8] ok.
+>      [8] ok.
+>      [9] ok.
+>      [9] ok.
+> ** IBM Test Result: ... 
+> ** Small Test Result: ... 
+> You requested to use 16 processes, but there is only 5 processes in your hostfile...
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
+> [rank 0] -> Tremblay
+> [rank 10] -> Tremblay
+> [rank 11] -> Jupiter
+> [rank 12] -> Fafard
+> [rank 13] -> Ginette
+> [rank 14] -> Bourassa
+> [rank 15] -> Tremblay
+> [rank 1] -> Jupiter
+> [rank 2] -> Fafard
+> [rank 3] -> Ginette
+> [rank 4] -> Bourassa
+> [rank 5] -> Tremblay
+> [rank 6] -> Jupiter
+> [rank 7] -> Fafard
+> [rank 8] -> Ginette
+> [rank 9] -> Bourassa