requalify tests impacted by previous change (just the order of messages in most).

For gh-139 the initialization order change led to threads starting and getting assigned a different PID, without changing the result itself.

diff --git a/examples/smpi/ampi_test/ampi_test.tesh b/examples/smpi/ampi_test/ampi_test.tesh
index 162f71d..5d3f9c5 100644 (file)
--- a/examples/smpi/ampi_test/ampi_test.tesh
+++ b/examples/smpi/ampi_test/ampi_test.tesh
@@ -4,6 +4,7 @@ $ rm -rf ${bindir:=.}/smpi_trace.trace ${bindir:=.}/smpi_trace.trace_files
 
 $ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:${bindir:=.}/smpi_trace.trace --cfg=tracing/smpi/format/ti-one-file:yes -no-privatize -replay ${srcdir:=.}/replay/actions_bcast.txt --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./ampi_test/smpi_ampi_test --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0
 
+! output sort
 $ sh -c "cat ${bindir:=.}/smpi_trace.trace_files/*"
 > 0 init
 > 0 iteration_in

diff --git a/examples/smpi/energy/energy.tesh b/examples/smpi/energy/energy.tesh
index 481fd83..8c7e204 100644 (file)
--- a/examples/smpi/energy/energy.tesh
+++ b/examples/smpi/energy/energy.tesh
@@ -1,5 +1,5 @@
 p Test smpi bindings for dvfs functions (C example)
-
+! output sort
 $ ${bindir:=.}/../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile  -platform ${platfdir}/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/../examples/smpi/energy/smpi_energy --cfg=plugin:host_energy --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0
 > [0.000000] [rank 0] Pstates: 3; Powers: 100000000, 50000000, 20000000
 > [0.000000] [rank 1] Pstates: 3; Powers: 100000000, 50000000, 20000000

diff --git a/examples/smpi/smpi_s4u_masterworker/s4u_smpi.tesh b/examples/smpi/smpi_s4u_masterworker/s4u_smpi.tesh
index d4023e7..4e84d1b 100644 (file)
--- a/examples/smpi/smpi_s4u_masterworker/s4u_smpi.tesh
+++ b/examples/smpi/smpi_s4u_masterworker/s4u_smpi.tesh
@@ -1,4 +1,5 @@
 p Test the use of SMPI+MSG in the same file, as well as several different SMPI instances at the same time
+! output sort
 $ ./masterworker_mailbox_smpi ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/deployment_masterworker_mailbox_smpi.xml --log=smpi.:info --cfg=smpi/simulate-computation:no
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/simulate-computation' to 'no'
 > [0.000000] [smpi_config/INFO] You did not set the power of the host running the simulation.  The timings will certainly not be accurate.  Use the option "--cfg=smpi/host-speed:<flops>" to set its value.  Check https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more information.

diff --git a/teshsuite/smpi/gh-139/gh-139.tesh b/teshsuite/smpi/gh-139/gh-139.tesh
index 322cc30..14ba8f1 100644 (file)
--- a/teshsuite/smpi/gh-139/gh-139.tesh
+++ b/teshsuite/smpi/gh-139/gh-139.tesh
@@ -1,15 +1,16 @@
+! output sort
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -np 2 -platform ${platfdir:=.}/small_platform.xml -hostfile ../hostfile ${bindir:=.}/gh-139 --cfg=smpi/simulate-computation:no --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
 > [Tremblay:0:(1) 0.000000] [smpi_test/INFO] I'm 0/2
 > [Jupiter:1:(2) 0.000000] [smpi_test/INFO] I'm 1/2
-> [Tremblay:wait send:(3) 0.000000] [smpi_test/INFO] new thread has parameter rank 0 and global variable rank 0
-> [Tremblay:wait send:(3) 0.000000] [smpi_test/INFO] 0 has MPI rank 0 and global variable rank 0
-> [Tremblay:wait send:(3) 0.000000] [smpi_test/INFO] 0 waiting request
-> [Tremblay:wait send:(3) 0.000000] [smpi_test/INFO] 0 request done, return MPI_SUCCESS
-> [Tremblay:wait send:(3) 0.000000] [smpi_test/INFO] 0 still has MPI rank 0 and global variable 0
-> [Jupiter:wait recv:(4) 0.000000] [smpi_test/INFO] new thread has parameter rank 1 and global variable rank 1
-> [Jupiter:wait recv:(4) 0.000000] [smpi_test/INFO] 1 has MPI rank 1 and global variable rank 1
-> [Jupiter:wait recv:(4) 0.000000] [smpi_test/INFO] 1 waiting request
-> [Jupiter:wait recv:(4) 0.002948] [smpi_test/INFO] 1 request done, return MPI_SUCCESS
-> [Jupiter:wait recv:(4) 0.002948] [smpi_test/INFO] 1 still has MPI rank 1 and global variable 1
+> [Tremblay:wait send:(4) 0.000000] [smpi_test/INFO] new thread has parameter rank 0 and global variable rank 0
+> [Tremblay:wait send:(4) 0.000000] [smpi_test/INFO] 0 has MPI rank 0 and global variable rank 0
+> [Tremblay:wait send:(4) 0.000000] [smpi_test/INFO] 0 waiting request
+> [Tremblay:wait send:(4) 0.000000] [smpi_test/INFO] 0 request done, return MPI_SUCCESS
+> [Tremblay:wait send:(4) 0.000000] [smpi_test/INFO] 0 still has MPI rank 0 and global variable 0
+> [Jupiter:wait recv:(3) 0.000000] [smpi_test/INFO] new thread has parameter rank 1 and global variable rank 1
+> [Jupiter:wait recv:(3) 0.000000] [smpi_test/INFO] 1 has MPI rank 1 and global variable rank 1
+> [Jupiter:wait recv:(3) 0.000000] [smpi_test/INFO] 1 waiting request
+> [Jupiter:wait recv:(3) 0.002948] [smpi_test/INFO] 1 request done, return MPI_SUCCESS
+> [Jupiter:wait recv:(3) 0.002948] [smpi_test/INFO] 1 still has MPI rank 1 and global variable 1
 > [Tremblay:0:(1) 1.000000] [smpi_test/INFO] finally 42
 > [Jupiter:1:(2) 2.000000] [smpi_test/INFO] finally 42

diff --git a/teshsuite/smpi/topo-cart-sub/topo-cart-sub.tesh b/teshsuite/smpi/topo-cart-sub/topo-cart-sub.tesh
index 02715d3..3da17ed 100644 (file)
--- a/teshsuite/smpi/topo-cart-sub/topo-cart-sub.tesh
+++ b/teshsuite/smpi/topo-cart-sub/topo-cart-sub.tesh
@@ -1,4 +1,5 @@
 p Test cart_sub
+! output sort
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ${platfdir:=.}/small_platform.xml -np 4 ${bindir:=.}/topo-cart-sub -q --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
 > [0.000000] [smpi/INFO] [rank 0] -> Tremblay
 > [0.000000] [smpi/INFO] [rank 1] -> Jupiter