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

[simgrid.git] / examples / msg / exception / exception.tesh

diff --git a/examples/msg/exception/exception.tesh b/examples/msg/exception/exception.tesh
index ab67769..4dff602 100644 (file)
--- a/examples/msg/exception/exception.tesh
+++ b/examples/msg/exception/exception.tesh
@@ -2,8 +2,8 @@
 
 p Testing the remote exception raising feature
 
-! output sort
-$ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/exception/deployment_exception.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=exception/cutpath:1"
+! output sort 19
+$ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=exception/cutpath:1"
 > [  0.000000] (1:terrorist@Jacquelin) Let's create a victim.
 > [  0.000000] (2:victim@Jacquelin) Let's work.
 > [  0.000000] (1:terrorist@Jacquelin) Going to sleep for 1 second
@@ -18,13 +18,15 @@ $ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml ${sr
 > [  3.000000] (2:victim@Jacquelin) The received exception resumed my suspension. Good. Here is it:  ----------------------->8----
 > ** SimGrid: UNCAUGHT EXCEPTION received on exception/exception(2): category: action canceled; value: 0
 > ** Canceled
-> ** Thrown by () on process 0
-> [  0.000000] (0:@) Configuration change: Set 'exception/cutpath' to '1'
+> ** Thrown by maestro() on process 0
+> [  0.000000] (0:maestro@) Configuration change: Set 'exception/cutpath' to '1'
 > [  3.000000] (2:victim@Jacquelin) Canceled
 >
-> **   In SIMIX_execution_finish() at smx_host.c
-> **   In SIMIX_run() at smx_global.c
-> **   In MSG_main() at msg_global.c
+> **   In SIMIX_execution_finish() at smx_host.cpp
+> **   In SIMIX_post_host_execute() at smx_host.cpp
+> **   In SIMIX_run() at src/simix/smx_global.cpp:482 (discriminator smx_global.cpp:482 (discriminator 1)
+> **   In SIMIX_simcall_exit() at popping.cpp
+> **   In MSG_main() at msg_global.cpp
 > **   In main() at exception.c
 > [  3.000000] (2:victim@Jacquelin) (end of the second exception) ----8<------------------------
 > [  3.000000] (2:victim@Jacquelin) Let's sleep for 10 seconds.
@@ -33,4 +35,4 @@ $ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml ${sr
 > [  6.000000] (2:victim@Jacquelin) The MSG_process_sleep caught the exception for me and returned 8)
 > [  6.000000] (2:victim@Jacquelin) Let's try a last time to do something on something
 > [ 16.000000] (2:victim@Jacquelin) That's enough now. I quit.
-> [ 16.000000] (0:@) Simulation time 16
+> [ 16.000000] (0:maestro@) Simulation time 16