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

diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh
index 7d0df32eaf..8725a0e98c 100644
--- a/examples/smpi/reduce.tesh
+++ b/examples/smpi/reduce.tesh
@@ -1,60 +1,54 @@
 # 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 Reduce with 3 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 3 ./reduce 
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./reduce -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
-> [0] has value 1
-> [1] has value 2
-> [2] has value 3
+> [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)
 > ** Scalar Int Test Result:
 > 	[0] sum=6 ... validation ok.
 > 	[0] min=1 ... validation ok.
 > 	[0] max=3 ... validation ok.
-> Elapsed time=0.007907 s
 > ** IBM Test Result: ... 
-> 	[0] ok.
-> 	[2] ok.
-> 	[1] ok.
+> 	ok.
+> 	ok.
+> 	ok.
 
 # second test
-! setenv LD_LIBRARY_PATH=../../src/.libs
-p Test Reduce with 6 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 6 ./reduce 
+! setenv LD_LIBRARY_PATH=../../lib
+p Test Reduce with 5 processes
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 5 ./reduce -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
 > [rank 3] -> Ginette
 > [rank 4] -> Bourassa
-> [rank 5] -> Tremblay
-> [0] has value 1
-> [1] has value 2
-> [2] has value 3
-> [3] has value 4
-> [4] has value 5
-> [5] has value 6
+> [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)
 > ** Scalar Int Test Result:
-> 	[0] sum=21 ... validation ok.
+> 	[0] sum=15 ... validation ok.
 > 	[0] min=1 ... validation ok.
-> 	[0] max=6 ... validation ok.
-> Elapsed time=0.007907 s
+> 	[0] max=5 ... validation ok.
 > ** IBM Test Result: ... 
-> 	[4] ok.
-> 	[2] ok.
-> 	[0] ok.
-> 	[5] ok.
-> 	[1] ok.
-> 	[3] ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
 
 
 # third test
-! setenv LD_LIBRARY_PATH=../../src/.libs
+! setenv LD_LIBRARY_PATH=../../lib
 p Test Reduce with 12 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 12 ./reduce 
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./reduce -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
@@ -67,33 +61,24 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 > [rank 9] -> Bourassa
 > [rank 10] -> Tremblay
 > [rank 11] -> Jupiter
-> [0] has value 1
-> [1] has value 2
-> [2] has value 3
-> [3] has value 4
-> [4] has value 5
-> [5] has value 6
-> [6] has value 7
-> [7] has value 8
-> [8] has value 9
-> [9] has value 10
-> [10] has value 11
-> [11] has value 12
+> [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)
 > ** Scalar Int Test Result:
 > 	[0] sum=78 ... validation ok.
 > 	[0] min=1 ... validation ok.
 > 	[0] max=12 ... validation ok.
-> Elapsed time=0.007908 s
 > ** IBM Test Result: ... 
-> 	[1] ok.
-> 	[11] ok.
-> 	[0] ok.
-> 	[5] ok.
-> 	[10] ok.
-> 	[3] ok.
-> 	[8] ok.
-> 	[4] ok.
-> 	[9] ok.
-> 	[2] ok.
-> 	[7] ok.
-> 	[6] ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.
+> 	ok.