X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed810d292615d6b5006fff0d3ea24aefbe2002..6aeed0145f123c033e0fdfc5b45066894fffc2a2:/examples/java/masterslave/masterslave.tesh

diff --git a/examples/java/masterslave/masterslave.tesh b/examples/java/masterslave/masterslave.tesh
index 8664ff8400..189988dd62 100644
--- a/examples/java/masterslave/masterslave.tesh
+++ b/examples/java/masterslave/masterslave.tesh
@@ -1,8 +1,9 @@
-#! ./tesh
+#! tesh
 
-! output sort
+! output sort 19
 
-$ java -cp ${classpath:=.} masterslave/Masterslave ./platform.xml ./masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process
 > [  0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0'
 > [  0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1'
@@ -26,7 +27,6 @@ $ java -cp ${classpath:=.} masterslave/Masterslave ./platform.xml ./masterslave/
 > [ 13.977355] (5:masterslave.Slave@Bousquet) Received Finalize. I'm done. See you!
 > [ 15.421041] (6:masterslave.Slave@Soucy) Received Finalize. I'm done. See you!
 > [ 16.278350] (7:masterslave.Slave@Kuenning) Received Finalize. I'm done. See you!
-> [ 17.251680] (0:@) MSG_main finished; Cleaning up the simulation...
+> [ 17.251680] (0:maestro@) MSG_main finished; Cleaning up the simulation...
 > [ 17.251680] (1:masterslave.Master@Jacquelin) Goodbye now!
 > [ 17.251680] (8:masterslave.Slave@Browne) Received Finalize. I'm done. See you!
-> [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.