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

[simgrid.git] / examples / msg / process-join / process-join.tesh

diff --git a/examples/msg/process-join/process-join.tesh b/examples/msg/process-join/process-join.tesh
index 5147a79..0fc54c6 100644 (file)
--- a/examples/msg/process-join/process-join.tesh
+++ b/examples/msg/process-join/process-join.tesh
@@ -1,5 +1,5 @@
 
-$ ./process-join$EXEEXT ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/process-join$EXEEXT ${srcdir:=.}/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Start slave
 > [Tremblay:slave from master:(2) 0.000000] [msg_test/INFO] Slave started
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Join the slave (timeout 2)
@@ -16,7 +16,7 @@ $ ./process-join$EXEEXT ${srcdir:=.}/small_platform.xml
 > [Tremblay:master:(1) 7.000000] [msg_test/INFO] Waiting 4
 > [Tremblay:slave from master:(4) 8.000000] [msg_test/INFO] I'm done. See you!
 > [Tremblay:slave from master:(5) 10.000000] [msg_test/INFO] I'm done. See you!
-> [Tremblay:master:(1) 11.000000] [msg_test/INFO] Join the slave (timeout 1)
+> [Tremblay:master:(1) 11.000000] [msg_test/INFO] Join the slave after its end (timeout 1)
 > [Tremblay:master:(1) 11.000000] [msg_test/INFO] Goodbye now!
 > [Tremblay:master:(1) 12.000000] [msg_test/INFO] Goodbye now!
 > [12.000000] [msg_test/INFO] Simulation time 12