change tesh test to account for new structure in time independent traces

Not ideal, as tesh is a bit too strict to allow us to really compare the files
(cherry picked from commit bf31c01ca3d4167bd748658b02b5938231f23fc5)

diff --git a/teshsuite/smpi/TI_output.tesh b/teshsuite/smpi/TI_output.tesh
index eb4c577..d8cc911 100644 (file)
--- a/teshsuite/smpi/TI_output.tesh
+++ b/teshsuite/smpi/TI_output.tesh
@@ -1,8 +1,11 @@
+$ rm -rf ./out_ti.txt_files
+$ rm -rf ./out_in_ti.txt_files
+
 p Test output of time independent tracing
 p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) 
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../smpi_script/bin/smpirun -trace-ti  --cfg=tracing/filename:out_in_ti.txt -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q
+$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=smpi/cpu_threshold:-1 -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q
 >     *** Ping-pong test (MPI_Send/MPI_Recv) ***
 > == pivot=0 : pingpong [0] <--> [1]
 > == pivot=1 : pingpong [1] <--> [2]
@@ -17,6 +20,7 @@ $ ../../smpi_script/bin/smpirun -trace-ti  --cfg=tracing/filename:out_in_ti.txt
 > [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] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_in_ti.txt'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
 > [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] 
@@ -37,10 +41,117 @@ $ ../../smpi_script/bin/smpirun -trace-ti  --cfg=tracing/filename:out_in_ti.txt
 > [rank 2] -> Fafard
 > [rank 3] -> Ginette
 
-< out_in_ti.txt
-$ mkfile replay_in.txt
+$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt --cfg=smpi/cpu_threshold:-1  -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ../../examples/smpi/smpi_replay ./out_in_ti.txt
+> [rank 0] -> Tremblay
+> [rank 1] -> Jupiter
+> [rank 2] -> Fafard
+> [rank 3] -> Ginette
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_simgrid.txt'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format' to 'TI'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes'
+> [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] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_ti.txt'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
+> [Jupiter:1:(0) 0.016798] [smpi_replay/INFO] Simulation time 0.0167975
+
+! output sort
+$ find ./out_ti.txt_files -type f -exec cat {} \;
+> 0 init
+> 0 send 1 1 1
+> 0 recv 1 1 1
+> 0 finalize
+> 1 init
+> 1 recv 0 1 1
+> 1 send 0 1 1
+> 1 send 2 1 1
+> 1 recv 2 1 1
+> 1 finalize
+> 2 init
+> 2 recv 1 1 1
+> 2 send 1 1 1
+> 2 send 3 1 1
+> 2 recv 3 1 1
+> 2 finalize
+> 3 init
+> 3 recv 2 1 1
+> 3 send 2 1 1
+> 3 finalize
+
+! output sort
+$ find ./out_in_ti.txt_files -type f -exec cat {} \;
+> 0 init
+> 0 send 1 1 1
+> 0 recv 1 1 1
+> 0 finalize
+> 1 init
+> 1 recv 0 1 1
+> 1 send 0 1 1
+> 1 send 2 1 1
+> 1 recv 2 1 1
+> 1 finalize
+> 2 init
+> 2 recv 1 1 1
+> 2 send 1 1 1
+> 2 send 3 1 1
+> 2 recv 3 1 1
+> 2 finalize
+> 3 init
+> 3 recv 2 1 1
+> 3 send 2 1 1
+> 3 finalize
+
+$ rm -rf ./out_ti.txt_files
+$ rm -rf ./out_in_ti.txt_files
+$ rm out_ti.txt
+$ rm out_in_ti.txt
+
+
 
-$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ../../examples/smpi/smpi_replay ./replay_in.txt
+p Same test, but only using one output file for all processes
+p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) 
+! output sort
+$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=tracing/smpi/format/ti_one_file:yes -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q
+>     *** Ping-pong test (MPI_Send/MPI_Recv) ***
+> == pivot=0 : pingpong [0] <--> [1]
+> == pivot=1 : pingpong [1] <--> [2]
+> == pivot=2 : pingpong [2] <--> [3]
+> [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 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_simgrid.txt'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format' to 'TI'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes'
+> [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] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_in_ti.txt'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format/ti_one_file' to 'yes'
+> [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] 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] increment message's value to  '102'
+> [rank 0] -> Tremblay
+> [rank 1] -> Jupiter
+> [rank 2] -> Fafard
+> [rank 3] -> Ginette
+
+$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-ti --cfg=tracing/filename:out_ti.txt --cfg=tracing/smpi/format/ti_one_file:yes   -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ../../examples/smpi/smpi_replay ./out_in_ti.txt
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -54,16 +165,16 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-t
 > [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] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_ti.txt'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format/ti_one_file' to 'yes'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [Jupiter:1:(0) 0.016798] [smpi_replay/INFO] Simulation time 0.0167976
 
-$ sort out_in_ti.txt -o out_in_ti_sorted.txt 
-$ sort out_ti.txt -o out_ti_sorted.txt 
-$ diff out_in_ti_sorted.txt out_ti_sorted.txt
 
-$ rm replay_in.txt
+
+$ rm -rf ./out_ti.txt_files
+$ rm -rf ./out_in_ti.txt_files
 $ rm out_ti.txt
 $ rm out_in_ti.txt
-$ rm out_ti_sorted.txt
-$ rm out_in_ti_sorted.txt
+
+