X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c4ec64086ad010dd90cd048fe89c076d802688e1..596e36117322c22fd31372e7803bc197bcd4a016:/examples/smpi/energy/energy.tesh

diff --git a/examples/smpi/energy/energy.tesh b/examples/smpi/energy/energy.tesh
index ee5fa2e08f..2554c05ac0 100644
--- a/examples/smpi/energy/energy.tesh
+++ b/examples/smpi/energy/energy.tesh
@@ -1,5 +1,6 @@
 p Test smpi bindings for dvfs functions (C example)
-$ ${bindir:=.}/../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile  -platform ${platfdir}/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/../examples/smpi/energy/smpi_energy --cfg=plugin:Energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
+! output sort
+$ ${bindir:=.}/../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile  -platform ${platfdir}/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/../examples/smpi/energy/smpi_energy --cfg=plugin:host_energy --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0
 > [0.000000] [rank 0] Pstates: 3; Powers: 100000000, 50000000, 20000000
 > [0.000000] [rank 1] Pstates: 3; Powers: 100000000, 50000000, 20000000
 > [0.000000] [rank 0] Current pstate: 0; Current power: 100000000
@@ -14,7 +15,7 @@ $ ${bindir:=.}/../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile
 > [30.000000] [rank 1] Current pstate: 2; Current power: 20000000
 > [80.000000] [rank 0] Energy consumed: 8650 Joules.
 > [80.000000] [rank 1] Energy consumed: 12900 Joules.
-> [80.000000] [surf_energy/INFO] Total energy consumption: 29550.000000 Joules (used hosts: 21550.000000 Joules; unused/idle hosts: 8000.000000)
-> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 8650.000000 Joules
-> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 12900.000000 Joules
-> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 8000.000000 Joules
+> [80.000000] [host_energy/INFO] Total energy consumption: 29550.000000 Joules (used hosts: 21550.000000 Joules; unused/idle hosts: 8000.000000)
+> [80.000000] [host_energy/INFO] Energy consumption of host MyHost1: 8650.000000 Joules
+> [80.000000] [host_energy/INFO] Energy consumption of host MyHost2: 12900.000000 Joules
+> [80.000000] [host_energy/INFO] Energy consumption of host MyHost3: 8000.000000 Joules