From fad1e9e2b5e9e3976bd301ec0f51ae72f0fac78a Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Mon, 6 Mar 2017 15:00:57 +0100 Subject: [PATCH] [Tests] Fixed two broken Java tests for the energy plugin --- examples/java/energy/consumption/energy_consumption.tesh | 1 + examples/java/energy/pstate/energy_pstate.tesh | 1 + 2 files changed, 2 insertions(+) diff --git a/examples/java/energy/consumption/energy_consumption.tesh b/examples/java/energy/consumption/energy_consumption.tesh index 5b35f4f16a..e957c97729 100644 --- a/examples/java/energy/consumption/energy_consumption.tesh +++ b/examples/java/energy/consumption/energy_consumption.tesh @@ -8,6 +8,7 @@ $ java -classpath ${classpath:=.} energy/consumption/Main ${srcdir:=.}/../platfo > [MyHost1:energyConsumer:(1) 0.000000] [jmsg/INFO] Initial peak speed= 1.0E8 flop/s; Energy dissipated = 0.0 J > [MyHost1:energyConsumer:(1) 10.000000] [jmsg/INFO] Currently consumed energy after sleeping 10 sec: 1000.0 > [MyHost1:energyConsumer:(1) 20.000000] [jmsg/INFO] Currently consumed energy after executing 1E9 flops: 2200.0 +> [20.000000] [surf_energy/INFO] Summed energy consumption: 6200.000000 Joules; used hosts consumed: 2200.000000 Joules; unused (idle) hosts consumed: 4000.000000 > [20.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [20.000000] [jmsg/INFO] Total simulation time: 20.0 > [20.000000] [surf_energy/INFO] Total energy of host MyHost1: 2200.000000 Joules diff --git a/examples/java/energy/pstate/energy_pstate.tesh b/examples/java/energy/pstate/energy_pstate.tesh index f37153435e..398458e7fc 100644 --- a/examples/java/energy/pstate/energy_pstate.tesh +++ b/examples/java/energy/pstate/energy_pstate.tesh @@ -18,6 +18,7 @@ $ java -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/e > [MyHost2:dvfs_test:(3) 6.000000] [jmsg/INFO] Count of Processor states=3 > [MyHost1:dvfs_test:(2) 6.000000] [jmsg/INFO] Current power peak=2.0E7 > [MyHost2:dvfs_test:(3) 6.000000] [jmsg/INFO] Current power peak=2.0E7 +> [6.000000] [surf_energy/INFO] Summed energy consumption: 1890.000000 Joules; used hosts consumed: 1290.000000 Joules; unused (idle) hosts consumed: 600.000000 > [6.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [6.000000] [surf_energy/INFO] Total energy of host MyHost1: 645.000000 Joules > [6.000000] [surf_energy/INFO] Total energy of host MyHost2: 645.000000 Joules -- 2.20.1