Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / examples / java / master_slave_bypass / bypass.tesh

diff --git a/examples/java/master_slave_bypass/bypass.tesh b/examples/java/master_slave_bypass/bypass.tesh
index 4909781..98a38b0 100644 (file)
--- a/examples/java/master_slave_bypass/bypass.tesh
+++ b/examples/java/master_slave_bypass/bypass.tesh
@@ -1,12 +1,12 @@
-#! ./tesh
+#! tesh
 
-! output sort
+! output sort 19
 
-$ java -cp ${classpath:=.} master_slave_bypass/MsBypass ./master_slave_bypass/platform.xml
-> [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
-> [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [alice:process2:(2) 0.000000] [jmsg/INFO] Slave Hello!
-> [alice:process2:(2) 0.000000] [jmsg/INFO] Send finalize!
-> [bob:process1:(1) 0.000000] [jmsg/INFO] Master Hello!
-> [bob:process1:(1) 0.000000] [jmsg/INFO] Create process on host 'alice'
-> [bob:process1:(1) 0.013010] [jmsg/INFO] Received Finalize. I'm done. See you!
+$ java -classpath ${classpath:=.} master_slave_bypass/MsBypass ${srcdir:=.}/../platforms/platform.xml
+> [0.000000] [jmsg/INFO] Using regular java threads.
+> [Boivin:process1:(1) 0.000000] [jmsg/INFO] Master Hello!
+> [Boivin:process1:(1) 0.000000] [jmsg/INFO] Create process on host 'Jacquelin'
+> [Jacquelin:process2:(2) 0.000000] [jmsg/INFO] Slave Hello!
+> [Jacquelin:process2:(2) 0.000000] [jmsg/INFO] Send finalize!
+> [Boivin:process1:(1) 1.048881] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [1.048881] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...