X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..59a54714388c22b03452da540ff0c0417612151e:/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh

diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
index 4a02863f0c..e52e9ad88d 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
-$ ./basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> Workstation number: 5, link number: 14
+> Workstation number: 5, link number: 12
 > Route between bob3.hamburger.edu and bob3.hamburger.edu
 > 	Route size 3
 > 	Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
@@ -153,9 +153,9 @@ $ ./basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=root.fmt:[%10.
 > 	Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 > 	Route latency = 0.000600, route bandwidth = 125000000.000000
 
-$ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> Workstation number: 4, link number: 10
+> Workstation number: 4, link number: 8
 > Route between bob1.hamburger.edu and bob1.hamburger.edu
 > 	Route size 3
 > 	Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
@@ -169,25 +169,21 @@ $ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 > 	Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob1.hamburger.edu and alice0.crepe.fr
-> 	Route size 7
+> 	Route size 5
 > 	Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between bob1.hamburger.edu and alice1.crepe.fr
-> 	Route size 7
+> 	Route size 5
 > 	Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob1.hamburger.edu
 > 	Route size 3
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
@@ -201,45 +197,37 @@ $ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 > 	Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and alice0.crepe.fr
-> 	Route size 7
+> 	Route size 5
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and alice1.crepe.fr
-> 	Route size 7
+> 	Route size 5
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and bob1.hamburger.edu
-> 	Route size 7
+> 	Route size 5
 > 	Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and bob0.hamburger.edu
-> 	Route size 7
+> 	Route size 5
 > 	Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and alice0.crepe.fr
 > 	Route size 3
 > 	Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
@@ -253,25 +241,21 @@ $ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 > 	Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and bob1.hamburger.edu
-> 	Route size 7
+> 	Route size 5
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and bob0.hamburger.edu
-> 	Route size 7
+> 	Route size 5
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
-> 	Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
-> 	Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 > 	Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 > 	Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
-> 	Route latency = 0.001700, route bandwidth = 125000000.000000
+> 	Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and alice0.crepe.fr
 > 	Route size 3
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
@@ -285,7 +269,7 @@ $ ./basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.
 > 	Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 > 	Route latency = 0.000600, route bandwidth = 125000000.000000
 
-$ ./basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > Workstation number: 2, link number: 4
 > Route between alice and alice
@@ -309,7 +293,7 @@ $ ./basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK --log=root.f
 > 	Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 > 	Route latency = 0.000015, route bandwidth = 498000000.000000
 
-$ ./basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > Workstation number: 2, link number: 3
 > Route between alice and alice
@@ -328,3 +312,25 @@ $ ./basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK --log=root.fm
 > 	Route size 1
 > 	Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 > 	Route latency = 0.000015, route bandwidth = 498000000.000000
+
+$ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
+> Workstation number: 2, link number: 6
+> Route between NODO01 and NODO01
+> 	Route size 1
+> 	Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+> 	Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between NODO01 and NODO02
+> 	Route size 2
+> 	Link 1: latency = 0.001000, bandwidth = 1000000.000000
+> 	Link 2: latency = 0.001000, bandwidth = 1000000.000000
+> 	Route latency = 0.002000, route bandwidth = 1000000.000000
+> Route between NODO02 and NODO01
+> 	Route size 2
+> 	Link 2: latency = 0.001000, bandwidth = 1000000.000000
+> 	Link 1: latency = 0.001000, bandwidth = 1000000.000000
+> 	Route latency = 0.002000, route bandwidth = 1000000.000000
+> Route between NODO02 and NODO02
+> 	Route size 1
+> 	Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+> 	Route latency = 0.000015, route bandwidth = 498000000.000000