X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb35f005960fefa613cc51e8f4d786f58b11849e..6de9090dd8692387ae343c587b26915f9922d7bd:/examples/smpi/bcast.tesh

diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh
index 3dfe4076a7..278d8dc7e4 100644
--- a/examples/smpi/bcast.tesh
+++ b/examples/smpi/bcast.tesh
@@ -1,51 +1,38 @@
 # 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
-
 # Go for the first test
 p Test Broadcast with less processes than hosts
-$ ../../src/smpi/smpirun -quiet -hostfile hostfile -platform ../msg/small_platform.xml -np 3 ./bcast -q
+$ ../../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 0 has value 17 before broadcast
-> node 1 has value 3 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] [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 'network/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
-! setenv LD_LIBRARY_PATH=../../src/.libs
-$ ../../src/smpi/smpirun -quiet -hostfile hostfile -platform ../msg/small_platform.xml -np 6 ./bcast -q
+! setenv LD_LIBRARY_PATH=../../lib
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 5 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
 > [rank 3] -> Ginette
 > [rank 4] -> Bourassa
-> [rank 5] -> Tremblay
-> node 0 has value 17 before broadcast
-> node 1 has value 3 before broadcast
-> node 2 has value 3 before broadcast
-> node 3 has value 3 before broadcast
-> node 4 has value 3 before broadcast
-> node 5 has value 3 before broadcast
-> node 4 has value 17 after broadcast
-> node 0 has value 17 after broadcast
-> node 5 has value 17 after broadcast
-> node 2 has value 17 after broadcast
-> node 1 has value 17 after broadcast
-> node 3 has value 17 after broadcast
-
+> [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 'network/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
-! setenv LD_LIBRARY_PATH=../../src/.libs
-$ ../../src/smpi/smpirun -quiet -hostfile hostfile -platform ../msg/small_platform.xml -np 12 ./bcast -q
+! setenv LD_LIBRARY_PATH=../../lib
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./bcast -q
+> You requested to use 12 processes, but there is only 5 processes in your hostfile...
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -58,27 +45,7 @@ $ ../../src/smpi/smpirun -quiet -hostfile hostfile -platform ../msg/small_platfo
 > [rank 9] -> Bourassa
 > [rank 10] -> Tremblay
 > [rank 11] -> Jupiter
-> node 0 has value 17 before broadcast
-> node 1 has value 3 before broadcast
-> node 2 has value 3 before broadcast
-> node 3 has value 3 before broadcast
-> node 4 has value 3 before broadcast
-> node 5 has value 3 before broadcast
-> node 6 has value 3 before broadcast
-> node 7 has value 3 before broadcast
-> node 8 has value 3 before broadcast
-> node 9 has value 3 before broadcast
-> node 10 has value 3 before broadcast
-> node 11 has value 3 before broadcast
-> node 10 has value 17 after broadcast
-> node 8 has value 17 after broadcast
-> node 0 has value 17 after broadcast
-> node 11 has value 17 after broadcast
-> node 7 has value 17 after broadcast
-> node 9 has value 17 after broadcast
-> node 3 has value 17 after broadcast
-> node 5 has value 17 after broadcast
-> node 1 has value 17 after broadcast
-> node 6 has value 17 after broadcast
-> node 2 has value 17 after broadcast
-> node 4 has value 17 after broadcast
+> [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 'network/TCP_gamma' to '4194304'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)