Restructure teshsuite smpi

[simgrid.git] / teshsuite / smpi / pingpong / pt2pt.tesh

diff --git a/teshsuite/smpi/pt2pt.tesh b/teshsuite/smpi/pingpong/pt2pt.tesh
similarity index 61%
rename from teshsuite/smpi/pt2pt.tesh
rename to teshsuite/smpi/pingpong/pt2pt.tesh
index a67ee17..d1c1099 100644 (file)
--- a/teshsuite/smpi/pt2pt.tesh
+++ b/teshsuite/smpi/pingpong/pt2pt.tesh
@@ -1,7 +1,7 @@
 p Test dsend
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./dsend -q --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 2 ${bindir:=.}/dsend -q --log=smpi_kernel.thres:warning
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'
@@ -16,7 +16,7 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $
 p Test pingpong
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/pingpong -q --log=smpi_kernel.thres:warning
 >     *** Ping-pong test (MPI_Send/MPI_Recv) ***
 > == pivot=0 : pingpong [0] <--> [1]
 > == pivot=1 : pingpong [1] <--> [2]
@@ -26,20 +26,20 @@ $ ../../smpi_script/bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform $
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/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] About to send 1st message '99' to process [1] 
-> [0] Received reply message '100' from process [1] 
-> [1] About to send 1st message '100' to process [2] 
-> [1] About to send back message '100' to process [0] 
-> [1] Received 1st message '99' from process [0] 
-> [1] Received reply message '101' from process [2] 
+> [0] About to send 1st message '99' to process [1]
+> [0] Received reply message '100' from process [1]
+> [1] About to send 1st message '100' to process [2]
+> [1] About to send back message '100' to process [0]
+> [1] Received 1st message '99' from process [0]
+> [1] Received reply message '101' from process [2]
 > [1] increment message's value to  '100'
-> [2] About to send 1st message '101' to process [3] 
-> [2] About to send back message '101' to process [1] 
-> [2] Received 1st message '100' from process [1] 
-> [2] Received reply message '102' from process [3] 
+> [2] About to send 1st message '101' to process [3]
+> [2] About to send back message '101' to process [1]
+> [2] Received 1st message '100' from process [1]
+> [2] Received reply message '102' from process [3]
 > [2] increment message's value to  '101'
-> [3] About to send back message '102' to process [2] 
-> [3] Received 1st message '101' from process [2] 
+> [3] About to send back message '102' to process [2]
+> [3] Received 1st message '101' from process [2]
 > [3] increment message's value to  '102'
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter