Merge branch 'master' of github.com:simgrid/simgrid into s_type_cleanup

[simgrid.git] / examples / msg / trace-categories / trace-categories.tesh

diff --git a/examples/msg/trace-categories/trace-categories.tesh b/examples/msg/trace-categories/trace-categories.tesh
index 12486a1..f2836b6 100644 (file)
--- a/examples/msg/trace-categories/trace-categories.tesh
+++ b/examples/msg/trace-categories/trace-categories.tesh
@@ -2,7 +2,7 @@
 
 p Tracing multiple categories master/worker application
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:categories.cat.plist --cfg=viva/uncategorized:categories.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:categories.cat.plist --cfg=viva/uncategorized:categories.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.trace'
@@ -12,23 +12,23 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tr
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'categories.uncat.plist'
 
 $ $SG_TEST_EXENV cat categories.cat.plist
->   node = ("HOST","LINK");
->   edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1");
+>   node = ("LINK","HOST");
+>   edge = ("0-LINK4-LINK4","0-LINK4-HOST1","0-HOST1-LINK4");
 >
 >   host = {
 >     type = "square";
 >     size = "power";
->     values = ("pdata","pcompute","pfinalize","prequest");
+>     values = ("pcompute","pdata","pfinalize","prequest");
 >   };
 >   link = {
 >     type = "rhombus";
 >     size = "bandwidth";
->     values = ("bdata","bcompute","bfinalize","brequest");
+>     values = ("bcompute","bdata","bfinalize","brequest");
 >   };
 
 $ $SG_TEST_EXENV cat categories.uncat.plist
->   node = ("HOST","LINK");
->   edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1");
+>   node = ("LINK","HOST");
+>   edge = ("0-LINK4-LINK4","0-LINK4-HOST1","0-HOST1-LINK4");
 >
 >   host = {
 >     type = "square";