X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1876077c6ea15e723a97fecfe65ab5fc88742012..a252f252b068c05c631fca63de412148ad81ee69:/examples/smpi/bcast.tesh

diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh
index 3584c6d8aa..d1dc7cc912 100644
--- a/examples/smpi/bcast.tesh
+++ b/examples/smpi/bcast.tesh
@@ -1,41 +1,51 @@
-# define a variable for the command line since it's so long
-# (since we use it only in rewriting in this file, defining it once is enough)
-! setenv cmdline=../../src/smpi/smpirun -quiet -hostfile hostfile -platform ../msg/small_platform.xml 
-
 # use the tested library, not the installed one
 # (since we want to pass it to the child, it has to be redefined before each command)
-! setenv LD_LIBRARY_PATH=../../src/.libs
-
-# Ignore the output since it contains timing information depending on the host speed
-#   (FIXME: add an option to SIMIX to not display this timing)
-! output display
-
 # Go for the first test
 p Test Broadcast with less processes than hosts
-$ ${cmdline} -np 3 ./bcast
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
-> node 1 has value 3 before broadcast
-> node 0 has value 17 before broadcast
-> node 2 has value 3 before broadcast
-> node 1 has value 17 after broadcast
-> node 0 has value 17 after broadcast
-> node 2 has value 17 after broadcast
-> [0.000000] [smpi_kernel/INFO] simulation time 0.00343892
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 
 
 
 # second test
 p Test Broadcast with as much processes than hosts
-! output display
-! setenv LD_LIBRARY_PATH=../../src/.libs
-$ ${cmdline} -np 6 ./bcast
-
+! setenv LD_LIBRARY_PATH=../../lib
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 6 ./bcast -q
+> [rank 0] -> Tremblay
+> [rank 1] -> Jupiter
+> [rank 2] -> Fafard
+> [rank 3] -> Ginette
+> [rank 4] -> Bourassa
+> [rank 5] -> Tremblay
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 
 
 # Another test
 p Test Broadcast with more processes than hosts
-! output display
-! setenv LD_LIBRARY_PATH=../../src/.libs
-$ ${cmdline} -np 12 ./bcast
+! setenv LD_LIBRARY_PATH=../../lib
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./bcast -q
+> [rank 0] -> 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
+> [rank 10] -> Tremblay
+> [rank 11] -> Jupiter
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)