Merge pull request #45 from mpoquet/master

[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 ce66ee7..975a6ba 100644 (file)
--- a/examples/msg/energy/vm/energy_vm.tesh
+++ b/examples/msg/energy/vm/energy_vm.tesh
@@ -4,8 +4,8 @@ p Testing the mechanism for computing host energy consumption in case of VMs
 
 $ $SG_TEST_EXENV energy/vm/energy_vm$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs@MyHost1) Creating and starting two VMs
-> [  0.000000] (0:@) Create VM(vm1)@PM(MyHost1) with 0 mounted disks
-> [  0.000000] (0:@) Create VM(vm2)@PM(MyHost3) with 0 mounted disks
+> [  0.000000] (0:@) Create VM(vm_host1)@PM(MyHost1) with 0 mounted disks
+> [  0.000000] (0:@) Create VM(vm_host3)@PM(MyHost3) with 0 mounted disks
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: one inside a VM, the other directly on the host
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: both directly on the host
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both inside a VM
@@ -14,10 +14,10 @@ $ $SG_TEST_EXENV energy/vm/energy_vm$EXEEXT ${srcdir:=.}/../platforms/energy_pla
 > [  6.000000] (4:p21@MyHost2) This worker is done.
 > [  6.000000] (5:p22@MyHost2) This worker is done.
 > [  6.000000] (3:p12@MyHost1) This worker is done.
-> [  6.000000] (2:p11@vm1) This worker is done.
-> [  6.000000] (6:p31@vm2) This worker is done.
-> [  6.000000] (7:p32@vm2) This worker is done.
+> [  6.000000] (2:p11@vm_host1) This worker is done.
+> [  6.000000] (6:p31@vm_host3) This worker is done.
+> [  6.000000] (7:p32@vm_host3) This worker is done.
 > [ 10.000000] (0:@) Total simulation time: 10.00; All hosts must have the exact same energy consumption.
-> [ 10.000000] (0:@) Total energy of host MyHost1: 1580.000000 Joules
+> [ 10.000000] (0:@) Total energy of host MyHost1: 1600.000000 Joules
 > [ 10.000000] (0:@) Total energy of host MyHost2: 1600.000000 Joules
 > [ 10.000000] (0:@) Total energy of host MyHost3: 1600.000000 Joules