Add a platform with a bypass route. Add the test to cmake.

[simgrid.git] / teshsuite / simdag / platforms / basic_parsing_test.tesh

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 664d4f8..aacd553 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -1,6 +1,6 @@
 $ ${bindir:=.}/basic_parsing_test one_cluster.xml "--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: 8
+> Workstation number: 5, link number: 7
 
 $ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
@@ -56,7 +56,7 @@ $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=roo
 
 $ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> Workstation number: 10, link number: 16
+> Workstation number: 10, link number: 14
 
 $ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
@@ -85,7 +85,7 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml
 $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/model:CpuTI
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010'
-> [0.000000] [surf_route/INFO] The custom configuration 'cpu/model' is already define by user!
+> [0.000000] [surf_parse/INFO] The custom configuration 'cpu/model' is already defined by user!
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to '~/'
@@ -93,11 +93,11 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/model:CpuTI
 
 $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
-> Workstation number: 2, link number: 5
+> Workstation number: 2, link number: 4
 
 $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
-> Workstation number: 12, link number: 1, elmts number: 25
+> Workstation number: 10, link number: 1, elmts number: 21
 >    - Seen: "host01" is type : 1
 >    - Seen: "host02" is type : 1
 >    - Seen: "host03" is type : 1
@@ -107,19 +107,15 @@ $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
 >    - Seen: "host07" is type : 1
 >    - Seen: "host08" is type : 1
 >    - Seen: "host09" is type : 1
+>    - Seen: "host10" is type : 1
 >    - Seen: "router1" is type : 2
 >    - Seen: "router2" is type : 2
 >    - Seen: "router3" is type : 2
 >    - Seen: "router4" is type : 2
 >    - Seen: "router5" is type : 2
->    - Seen: "router6" is type : 2
->    - Seen: "host10" is type : 1
->    - Seen: "host11" is type : 1
->    - Seen: "host12" is type : 1
 >    - Seen: "AS0" is type : 3
 >    - Seen: "AS1" is type : 3
 >    - Seen: "AS2" is type : 3
 >    - Seen: "AS3" is type : 3
 >    - Seen: "AS4" is type : 3
->    - Seen: "AS5" is type : 3
 >    - Seen: "AS" is type : 3
\ No newline at end of file