Use cmake's JAVA_EXECUTABLE to run Java tests.

[simgrid.git] / examples / java / energy / pstate / energy-pstate.tesh

diff --git a/examples/java/energy/pstate/energy-pstate.tesh b/examples/java/energy/pstate/energy-pstate.tesh
index 32e2e37..1dc3ab7 100644 (file)
--- a/examples/java/energy/pstate/energy-pstate.tesh
+++ b/examples/java/energy/pstate/energy-pstate.tesh
@@ -1,6 +1,6 @@
-#! tesh
+#!/usr/bin/env tesh
 
-$ java -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/energy_platform.xml
+$ ${javacmd:=java} -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/energy_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [MyHost1:dvfs_test:(2) 0.000000] [java/INFO] Count of Processor states=3
 > [MyHost1:dvfs_test:(2) 0.000000] [java/INFO] Current power peak=1.0E8
@@ -19,7 +19,7 @@ $ java -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/e
 > [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Count of Processor states=3
 > [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Current power peak=2.0E7
 > [6.000000] [surf_energy/INFO] Total energy consumption: 2195.000000 Joules (used hosts: 1595.000000 Joules; unused/idle hosts: 600.000000)
-> [6.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [6.000000] [java/INFO] MSG_main finished; Terminating the simulation...
 > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 645.000000 Joules
 > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 950.000000 Joules
 > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 600.000000 Joules