Use cmake's JAVA_EXECUTABLE to run Java tests.

[simgrid.git] / examples / java / app / tokenring / app-tokenring.tesh

diff --git a/examples/java/app/tokenring/app-tokenring.tesh b/examples/java/app/tokenring/app-tokenring.tesh
index 73a084d..23bc1bd 100644 (file)
--- a/examples/java/app/tokenring/app-tokenring.tesh
+++ b/examples/java/app/tokenring/app-tokenring.tesh
@@ -1,6 +1,6 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
-$ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
+$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (0:maestro@) Number of hosts '6'
 > [  0.000000] (1:0@host1) Host '0' send 'Token' to Host '1'
@@ -15,20 +15,18 @@ $ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/r
 > [  0.101019] (6:5@host6) Host '5' received 'Token'
 > [  0.101019] (6:5@host6) Host '5' send 'Token' to Host '0'
 > [  0.131796] (1:0@host1) Host '0' received 'Token'
-> [  0.131796] (0:maestro@) MSG_main finished; Cleaning up the simulation...
-> [  0.131796] (0:maestro@) Simulation time 0.13179602061855672
+> [  0.131796] (0:maestro@) MSG_main finished; Terminating the simulation...
 
-$ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n'
+$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n'
 > [    0.000000] (0:maestro@) Using regular java threads.
 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@100030591) Host '0' send 'Token' to Host '1'
 > [    0.624423] (2:1@100036570) Host '1' received 'Token'
 > [    0.624423] (2:1@100036570) Host '1' send 'Token' to Host '0'
 > [    1.248846] (1:0@100030591) Host '0' received 'Token'
-> [    1.248846] (0:maestro@) MSG_main finished; Cleaning up the simulation...
-> [    1.248846] (0:maestro@) Simulation time 1.2488464578972847
+> [    1.248846] (0:maestro@) MSG_main finished; Terminating the simulation...
 
-$ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
+$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (0:maestro@) Number of hosts '60'
 > [  0.000000] (1:0@host-1.cluster1) Host '0' send 'Token' to Host '1'
@@ -151,5 +149,4 @@ $ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/m
 > [  1.791501] (60:59@host-9.cluster2) Host '59' received 'Token'
 > [  1.791501] (60:59@host-9.cluster2) Host '59' send 'Token' to Host '0'
 > [  1.821865] (1:0@host-1.cluster1) Host '0' received 'Token'
-> [  1.821865] (0:maestro@) MSG_main finished; Cleaning up the simulation...
-> [  1.821865] (0:maestro@) Simulation time 1.8218653608247406
+> [  1.821865] (0:maestro@) MSG_main finished; Terminating the simulation...