Adapt tesh files for smpi.

[simgrid.git] / examples / smpi / reduce.tesh

diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh
index 859de0a..545e537 100644 (file)
--- a/examples/smpi/reduce.tesh
+++ b/examples/smpi/reduce.tesh
@@ -4,10 +4,11 @@
 
 # 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 
+$ ../../src/smpi/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.000000] [simix_network/INFO] Output message sizes to toto.txt
 > [0] has value 1
 > [1] has value 2
 > [2] has value 3
@@ -15,22 +16,22 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 >      [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 
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 6 ./reduce -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
 > [rank 3] -> Ginette
 > [rank 4] -> Bourassa
 > [rank 5] -> Tremblay
+> [0.000000] [simix_network/INFO] Output message sizes to toto.txt
 > [0] has value 1
 > [1] has value 2
 > [2] has value 3
@@ -41,20 +42,19 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 >      [0] sum=21 ... validation ok.
 >      [0] min=1 ... validation ok.
 >      [0] max=6 ... validation ok.
-> Elapsed time=0.007907 s
 > ** IBM Test Result: ... 
->      [2] ok.
->      [5] ok.
->      [4] ok.
->      [0] ok.
->      [1] ok.
->      [3] ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
 
 
 # third test
 ! setenv LD_LIBRARY_PATH=../../src/.libs
 p Test Reduce with 12 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 12 ./reduce 
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./reduce -q 
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -67,6 +67,7 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 > [rank 9] -> Bourassa
 > [rank 10] -> Tremblay
 > [rank 11] -> Jupiter
+> [0.000000] [simix_network/INFO] Output message sizes to toto.txt
 > [0] has value 1
 > [1] has value 2
 > [2] has value 3
@@ -83,17 +84,16 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 >      [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.
->      [5] ok.
->      [10] ok.
->      [0] ok.
->      [3] ok.
->      [8] ok.
->      [9] ok.
->      [4] ok.
->      [7] ok.
->      [2] ok.
->      [6] ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.
+>      ok.