Remove 2 (out of 3) horrible hacks around Java contexts

[simgrid.git] / teshsuite / java / sleephostoff / sleephostoff.tesh

diff --git a/teshsuite/java/sleephostoff/sleephostoff.tesh b/teshsuite/java/sleephostoff/sleephostoff.tesh
index 55aabb5..cdb73b7 100644 (file)
--- a/teshsuite/java/sleephostoff/sleephostoff.tesh
+++ b/teshsuite/java/sleephostoff/sleephostoff.tesh
@@ -1,4 +1,4 @@
-$ java -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${javacmd:=java} -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:TestRunner@Fafard) **** **** **** ***** ***** Test Sleep ***** ***** **** **** ****
 > [  0.000000] (1:TestRunner@Fafard) Test sleep: Create a process on Tremblay that simply make periodic sleep, turn off Tremblay
@@ -6,7 +6,7 @@ $ java -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir:=.}/small_p
 > [  0.010000] (2:Sleeper@Tremblay) I'm not dead
 > [  0.020000] (1:TestRunner@Fafard) Stop Tremblay
 > [  0.020000] (2:Sleeper@Tremblay) I'm not dead
-> [  0.020000] (2:Sleeper@Tremblay) catch HostException: Host Failure 
 > [  0.020000] (1:TestRunner@Fafard) Tremblay has been stopped
+> [  0.020000] (2:Sleeper@Tremblay) catch HostException: Host Failure 
 > [  0.320000] (1:TestRunner@Fafard) Test sleep seems ok, cool! (number of Process : 1, it should be 1 (i.e. the Test one))
-> [  0.320000] (0:maestro@) MSG_main finished; Cleaning up the simulation...
+> [  0.320000] (0:maestro@) MSG_main finished; Terminating the simulation...