From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 5 Dec 2017 07:55:09 +0000 (+0100)
Subject: fix this test
X-Git-Tag: v3.18~149
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/39b75f30af8584902dfd3dc267c894ce2c65489f

fix this test
 1) print what is actually done in terms of mapping
 2) remove useless call to shutdown as destroy starts by calling
    shutdown
---

diff --git a/examples/msg/energy-vm/energy-vm.c b/examples/msg/energy-vm/energy-vm.c
index 9b3a0020a8..6afa6fabb3 100644
--- a/examples/msg/energy-vm/energy-vm.c
+++ b/examples/msg/energy-vm/energy-vm.c
@@ -30,15 +30,15 @@ static int dvfs(int argc, char *argv[])
   msg_vm_t vm_host2 = MSG_vm_create(host2, "vm_host3", 1, 2048, 10, 50);
   MSG_vm_start(vm_host2);
 
-  XBT_INFO("Create two tasks on Host1: one inside a VM, the other directly on the host");
+  XBT_INFO("Create two tasks on Host1: both inside a VM");
   MSG_process_create("p11", worker_func, NULL, (msg_host_t)vm_host1);
   MSG_process_create("p12", worker_func, NULL, (msg_host_t)vm_host1);
 
-  XBT_INFO("Create two tasks on Host2: both directly on the host");
+  XBT_INFO("Create two tasks on Host2: one inside a VM, the other directly on the host");
   MSG_process_create("p21", worker_func, NULL, (msg_host_t)vm_host2);
   MSG_process_create("p22", worker_func, NULL, host2);
 
-  XBT_INFO("Create two tasks on Host3: both inside a VM");
+  XBT_INFO("Create two tasks on Host3: both directly on the host");
   MSG_process_create("p31", worker_func, NULL, host3);
   MSG_process_create("p32", worker_func, NULL, host3);
 
@@ -48,8 +48,6 @@ static int dvfs(int argc, char *argv[])
   XBT_INFO("Wait another 5 seconds. The tasks stop at some point in between");
   MSG_process_sleep(5);
 
-  MSG_vm_shutdown(vm_host1);
-  MSG_vm_shutdown(vm_host2);
   MSG_vm_destroy(vm_host1);
   MSG_vm_destroy(vm_host2);
 
diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/msg/energy-vm/energy-vm.tesh
index d64b38b9d1..f6195e1210 100644
--- a/examples/msg/energy-vm/energy-vm.tesh
+++ b/examples/msg/energy-vm/energy-vm.tesh
@@ -4,9 +4,9 @@ p Testing the mechanism for computing host energy consumption in case of VMs
 
 $ ${bindir:=.}/energy-vm$EXEEXT ${platfdir}/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] (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
+> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: both inside a VM
+> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: one inside a VM, the other directly on the host
+> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both directly on the host
 > [  0.000000] (1:dvfs@MyHost1) Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds)
 > [  5.000000] (1:dvfs@MyHost1) Wait another 5 seconds. The tasks stop at some point in between
 > [  6.000000] (5:p22@MyHost2) This worker is done.