Modular tests to improve report redabillity.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7177 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
new file mode 100644 (file)
index 0000000..089f5ef
--- /dev/null
+++ b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
@@ -0,0 +1,13 @@
+#! ./tesh
+
+p Testing dogbone communication pattern with GTNets model
+
+$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+> [S1:master:(1) 0.300171] [msg_test/INFO] Send completed (to C1). Transfer time: 0.300171      Agregate bandwidth: 33314.335278
+> [S1:master:(1) 0.300171] [msg_test/INFO] Completed peer: C1 time: 0.300171
+> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ;  message from S1 to C1  with remaining : 0.000000
+> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ;  message from S2 to C2  with remaining : 0.000000
+

diff --git a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
new file mode 100644 (file)
index 0000000..9b5cee9
--- /dev/null
+++ b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
@@ -0,0 +1,15 @@
+#! ./tesh
+
+p Testing dogbone communication pattern with LV08 model
+
+$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
+> [S1:master:(1) 0.342000] [msg_test/INFO] Send completed (to C1). Transfer time: 0.342000      Agregate bandwidth: 29239.766082
+> [S1:master:(1) 0.342000] [msg_test/INFO] Completed peer: C1 time: 0.342000
+> [S2:master:(2) 0.342000] [msg_test/INFO] Send completed (to C2). Transfer time: 0.342000      Agregate bandwidth: 29239.766082
+> [S2:master:(2) 0.342000] [msg_test/INFO] Completed peer: C2 time: 0.342000
+> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ;  message from S1 to C1  with remaining : 0.000000
+> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ;  message from S2 to C2  with remaining : 0.000000
+

diff --git a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh
new file mode 100644 (file)
index 0000000..48dd4b2
--- /dev/null
+++ b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh
@@ -0,0 +1,12 @@
+#! ./tesh
+
+p Testing onelink communication pattern with GTNets model
+
+$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+> [S1:master:(1) 106.291000] [msg_test/INFO] Send completed (to C1). Transfer time: 106.291000  Agregate bandwidth: 9408.134273
+> [S1:master:(1) 106.291000] [msg_test/INFO] Completed peer: C1 time: 106.291000
+> [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ;  message from S1 to C1  with remaining : 0.000000
+

diff --git a/examples/msg/gtnets/gtnets-onelink-lv08.tesh b/examples/msg/gtnets/gtnets-onelink-lv08.tesh
new file mode 100644 (file)
index 0000000..38cf50c
--- /dev/null
+++ b/examples/msg/gtnets/gtnets-onelink-lv08.tesh
@@ -0,0 +1,11 @@
+#! ./tesh
+
+p Testing onelink communication pattern with LV08 model
+
+$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01  --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
+> [S1:master:(1) 108.799652] [msg_test/INFO] Send completed (to C1). Transfer time: 108.799652  Agregate bandwidth: 9191.205854
+> [S1:master:(1) 108.799652] [msg_test/INFO] Completed peer: C1 time: 108.799652
+> [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ;  message from S1 to C1  with remaining : 0.000000

diff --git a/examples/msg/gtnets/gtnets.tesh b/examples/msg/gtnets/gtnets-waxman.tesh
similarity index 90%
rename from examples/msg/gtnets/gtnets.tesh
rename to examples/msg/gtnets/gtnets-waxman.tesh
index 65fa126..502faed 100644 (file)
--- a/examples/msg/gtnets/gtnets.tesh
+++ b/examples/msg/gtnets/gtnets-waxman.tesh
@@ -1,48 +1,5 @@
 #! ./tesh
 
-p Testing onelink communication pattern with LV08 model
-
-$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
-> [S1:master:(1) 108.799652] [msg_test/INFO] Send completed (to C1). Transfer time: 108.799652  Agregate bandwidth: 9191.205854
-> [S1:master:(1) 108.799652] [msg_test/INFO] Completed peer: C1 time: 108.799652
-> [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ;  message from S1 to C1  with remaining : 0.000000
-
-p Testing onelink communication pattern with GTNets model
-
-$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
-> [S1:master:(1) 106.291000] [msg_test/INFO] Send completed (to C1). Transfer time: 106.291000  Agregate bandwidth: 9408.134273
-> [S1:master:(1) 106.291000] [msg_test/INFO] Completed peer: C1 time: 106.291000
-> [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ;  message from S1 to C1  with remaining : 0.000000
-
-p Testing dogbone communication pattern with LV08 model
-
-$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
-> [S1:master:(1) 0.342000] [msg_test/INFO] Send completed (to C1). Transfer time: 0.342000      Agregate bandwidth: 29239.766082
-> [S1:master:(1) 0.342000] [msg_test/INFO] Completed peer: C1 time: 0.342000
-> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ;  message from S2 to C2  with remaining : 0.000000
-
-p Testing dogbone communication pattern with GTNets model
-
-$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
-> [S1:master:(1) 0.300171] [msg_test/INFO] Send completed (to C1). Transfer time: 0.300171      Agregate bandwidth: 33314.335278
-> [S1:master:(1) 0.300171] [msg_test/INFO] Completed peer: C1 time: 0.300171
-> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ;  message from S2 to C2  with remaining : 0.000000
-
-
 p Testing waxman radom communication pattern with GTNets model, 200 nodes, 200 flows
 
 $ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets