Merge branches, and adapt the new code to the new refactoring.

[simgrid.git] / examples / msg / energy-vm / energy-vm.tesh

diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/msg/energy-vm/energy-vm.tesh
index 314ce3a..ab2e86b 100644 (file)
--- a/examples/msg/energy-vm/energy-vm.tesh
+++ b/examples/msg/energy-vm/energy-vm.tesh
@@ -16,6 +16,6 @@ $ $SG_TEST_EXENV energy-vm/energy-vm$EXEEXT ${srcdir:=.}/../platforms/energy_pla
 > [  6.000000] (6:p31@vm_host3) This worker is done.
 > [  6.000000] (7:p32@vm_host3) This worker is done.
 > [ 10.000000] (0:maestro@) Total simulation time: 10.00; All hosts must have the exact same energy consumption.
-> [ 10.000000] (0:maestro@) Total energy of host MyHost1: 1600.000000 Joules
-> [ 10.000000] (0:maestro@) Total energy of host MyHost2: 1600.000000 Joules
-> [ 10.000000] (0:maestro@) Total energy of host MyHost3: 1600.000000 Joules
+> [ 10.000000] (0:maestro@) Total energy of host MyHost1: 1120.000000 Joules
+> [ 10.000000] (0:maestro@) Total energy of host MyHost2: 1120.000000 Joules
+> [ 10.000000] (0:maestro@) Total energy of host MyHost3: 1120.000000 Joules