merge conflicts resolved

[simgrid.git] / examples / msg / sendrecv / sendrecv_CLM03.tesh

diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh
index 04789d4..a5832ef 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_CLM03.tesh
+++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh
@@ -1,11 +1,10 @@
 #! ./tesh
 
-p Testing the surf network maxmin fairness model
+p Testing the deprecated CM02 network model
 
 ! output sort
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) Configuration change: Set 'workstation/model' to 'CLM03'
-> [  0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+>  [  0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:@) test_all
 > [  0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s)
@@ -20,5 +19,4 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrec
 > [10000.200100] (0:@) Total simulation time: 1.000020e+04
 > [10000.200100] (2:receiver@Bellevue) Task received : bandwidth task
 > [10000.200100] (2:receiver@Bellevue) Communic. time 1.000010e+04
-> [10000.200100] (2:receiver@Bellevue) --- bw 99999.000010 ----
-
+> [10000.200100] (2:receiver@Bellevue) --- bw 99999.000010 ----
\ No newline at end of file