[trace] fixing tracing tesh'es due to latest changes in link trace identifiers

diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/tracing/categories.tesh
index a4ad298..eb1f4f9 100644 (file)
--- a/examples/msg/tracing/categories.tesh
+++ b/examples/msg/tracing/categories.tesh
@@ -15,7 +15,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tr
 $ $SG_TEST_EXENV cat tracing/categories.cat.plist
 > {
 >   node = (LINK, HOST, );
 $ $SG_TEST_EXENV cat tracing/categories.cat.plist
 > {
 >   node = (LINK, HOST, );

->   edge = (HOST-LINK, LINK-HOST, LINK-LINK, );
+>   edge = (0-LINK4-HOST1, 0-HOST1-LINK4, 0-LINK4-LINK4, );

 > 
 >   host = {
 >     type = square;
 > 
 >   host = {
 >     type = square;


@@ -32,7 +32,7 @@ $ $SG_TEST_EXENV cat tracing/categories.cat.plist
 $ $SG_TEST_EXENV cat tracing/categories.uncat.plist
 > {
 >   node = (LINK, HOST, );
 $ $SG_TEST_EXENV cat tracing/categories.uncat.plist
 > {
 >   node = (LINK, HOST, );

->   edge = (HOST-LINK, LINK-HOST, LINK-LINK, );
+>   edge = (0-LINK4-HOST1, 0-HOST1-LINK4, 0-LINK4-LINK4, );

 > 
 >   host = {
 >     type = square;
 > 
 >   host = {
 >     type = square;

diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh
index b3770d9..b8aff0d 100644 (file)
--- a/examples/msg/tracing/ms.tesh
+++ b/examples/msg/tracing/ms.tesh
@@ -26,7 +26,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/ms
 $ $SG_TEST_EXENV cat tracing/ms.uncat.plist
 > {
 >   node = (LINK, HOST, );
 $ $SG_TEST_EXENV cat tracing/ms.uncat.plist
 > {
 >   node = (LINK, HOST, );

->   edge = (HOST-LINK, LINK-HOST, LINK-LINK, );
+>   edge = (0-HOST1-LINK14, 0-LINK14-HOST1, 0-LINK14-LINK14, );

 > 
 >   host = {
 >     type = square;
 > 
 >   host = {
 >     type = square;


@@ -43,7 +43,7 @@ $ $SG_TEST_EXENV cat tracing/ms.uncat.plist
 $ $SG_TEST_EXENV cat tracing/ms.cat.plist
 > {
 >   node = (LINK, HOST, );
 $ $SG_TEST_EXENV cat tracing/ms.cat.plist
 > {
 >   node = (LINK, HOST, );

->   edge = (HOST-LINK, LINK-HOST, LINK-LINK, );
+>   edge = (0-HOST1-LINK14, 0-LINK14-HOST1, 0-LINK14-LINK14, );

 > 
 >   host = {
 >     type = square;
 > 
 >   host = {
 >     type = square;

diff --git a/examples/msg/tracing/trace_platform.tesh b/examples/msg/tracing/trace_platform.tesh
index b545934..93c650b 100644 (file)
--- a/examples/msg/tracing/trace_platform.tesh
+++ b/examples/msg/tracing/trace_platform.tesh
@@ -156,10 +156,10 @@ $ cat simgrid.trace
 > 6 0 15 3 0 "5"
 > 8 0 4 15 27946250.000000
 > 8 0 5 15 0.000278
 > 6 0 15 3 0 "5"
 > 8 0 4 15 27946250.000000
 > 8 0 5 15 0.000278

-> 4 6 0 1 3 HOST-LINK
+> 4 6 0 1 3 0-HOST1-LINK3

 > 14 0 6 0 G 3 0
 > 15 0 6 0 G 11 0
 > 14 0 6 0 G 3 0
 > 15 0 6 0 G 11 0

-> 4 7 0 3 3 LINK-LINK
+> 4 7 0 3 3 0-LINK3-LINK3

 > 14 0 7 0 G 11 1
 > 15 0 7 0 G 12 1
 > 14 0 7 0 G 12 2
 > 14 0 7 0 G 11 1
 > 15 0 7 0 G 12 1
 > 14 0 7 0 G 12 2


@@ -170,7 +170,7 @@ $ cat simgrid.trace
 > 15 0 7 0 G 7 4
 > 14 0 7 0 G 7 5
 > 15 0 7 0 G 13 5
 > 15 0 7 0 G 7 4
 > 14 0 7 0 G 7 5
 > 15 0 7 0 G 13 5

-> 4 8 0 3 1 LINK-HOST
+> 4 8 0 3 1 0-LINK3-HOST1

 > 14 0 8 0 G 13 6
 > 15 0 8 0 G 1 6
 > 14 0 7 0 G 11 7
 > 14 0 8 0 G 13 6
 > 15 0 8 0 G 1 6
 > 14 0 7 0 G 11 7