Fix smpi_sleep to execute the sleep on the simulated host (ignoring running host...

[simgrid.git] / teshsuite / smpi / mpich-test / coll / runtests

diff --git a/teshsuite/smpi/mpich-test/coll/runtests b/teshsuite/smpi/mpich-test/coll/runtests
index fe5080e..65bcdd7 100755 (executable)
--- a/teshsuite/smpi/mpich-test/coll/runtests
+++ b/teshsuite/smpi/mpich-test/coll/runtests
@@ -3,8 +3,6 @@
 # -mvhome is needed for the ANL SP, and is ignored by others
 args=
 device=
-#top_srcdir=/home/degomme/Downloads/mpich-test
-#srcdir=/home/degomme/Downloads/mpich-test/coll
 MPICH_VERSION=
 STOPFILE=${MPITEST_STOPTEST:-"$HOME/.stopmpichtests"}
 
@@ -19,6 +17,7 @@ runtests=1
 makeeach=0
 writesummaryfile=no
 have_fortran=0
+have_selector="no"
 quiet=0
 MAKE="make --no-print-directory"
 for arg in "$@" ; do
@@ -32,6 +31,9 @@ for arg in "$@" ; do
        -fort=* )
        have_fortran=`echo $arg | sed 's/-fort=//'`
        ;;
+       -selector=* )
+       have_selector=`echo $arg | sed 's/-selector=//'`
+       ;;
        -checkonly )
        runtests=0
        ;;
@@ -75,7 +77,13 @@ if [ ! -x coll1 -a $makeeach = 0 -a $runtests = 1 ] ; then
     $MAKE
 fi
 
-mpirun=" ${basedir}/bin/smpirun -platform ${srcdir}/../../../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile  --log=root.thres:critical"
+if [ $have_selector -eq "" ] ; then 
+selector=""
+else
+selector="--cfg=smpi/coll_selector:$have_selector"
+fi
+
+mpirun=" ${basedir}/bin/smpirun -platform ${srcdir}/../../../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile  --log=root.thres:critical  --cfg=network/optim:Full $selector "
 testfiles=""
 if [ $runtests = 1 ] ; then
 echo '**** Testing MPI Collective routines ****'
@@ -106,10 +114,8 @@ RunTest coll8 4
 
 RunTest coll9 4
 
-#smpi does not handle non commutative operations, removed
-#RunTest coll10 4
+RunTest coll10 4
 
-#smpi does not handle non commutative operations, removed
 RunTest coll11 4
 
 #weird manipulations of ranks in split, and comms -> deadlock, removed
@@ -118,7 +124,7 @@ RunTest coll11 4
 RunTest coll12 4
 
 # coll13 is very picky about arguments
-RunTest coll13 4
+RunTest coll13 14
 
 RunTest longuser 4
 
@@ -147,7 +153,7 @@ rm -f longuser1
 #CleanExe allredmany
 
 RunTest grouptest 4
-#uses MPI_Dims_create, MPI_Cart_create ... removed
+
 RunTest allred 4 "*** Allred ***"
 
 RunTest allred2 4 "*** Allred2 ***"
@@ -156,8 +162,7 @@ RunTest allred2 4 "*** Allred2 ***"
 
 RunTest scattern 4 "*** Scattern ***"
 
-#fails, more debug needed to understand
-#RunTest redscat 4 "*** Reduce_scatter ***"
+RunTest redscat 4 "*** Reduce_scatter ***"
 
 RunTest alltoallv_mpich 4 "*** Alltoallv ***"
 echo "runtests: fortran ($have_fortran)"