Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[simgrid.git] / examples / msg / energy / consumption / energy_consumption.tesh

diff --git a/examples/msg/energy/consumption/energy_consumption.tesh b/examples/msg/energy/consumption/energy_consumption.tesh
index 4f91d8d..aa76c11 100644 (file)
--- a/examples/msg/energy/consumption/energy_consumption.tesh
+++ b/examples/msg/energy/consumption/energy_consumption.tesh
@@ -2,7 +2,6 @@
 
 p Testing the mechanism for computing host energy consumption
 
-! output sort 19
 $ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/consumption/deployment_consumption.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:200.0, 93.0:170.0, 90.0:150.0
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
@@ -16,8 +15,8 @@ $ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../pl
 > [ 16.000000] (1:dvfs_test@MyHost1) Sleep for 4 seconds
 > [ 20.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 4.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=2310 J
 > [ 20.000000] (1:dvfs_test@MyHost1) Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated 2000 J so far.
-> [ 30.000000] (0:@) Total simulation time: 30.00
-> [ 30.000000] (0:@) Total energy of host MyHost1: 3210.000000 Joules
-> [ 30.000000] (0:@) Total energy of host MyHost2: 2100.000000 Joules
-> [ 30.000000] (0:@) Total energy of host MyHost3: 3000.000000 Joules
 > [ 30.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=3210 J
+> [ 30.000000] (0:maestro@) Total simulation time: 30.00
+> [ 30.000000] (0:maestro@) Total energy of host MyHost1: 3210.000000 Joules
+> [ 30.000000] (0:maestro@) Total energy of host MyHost2: 2100.000000 Joules
+> [ 30.000000] (0:maestro@) Total energy of host MyHost3: 3000.000000 Joules