X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ed8be9e9f7601bd85bbea22ee0cf80ed2266c41..9f54e5c450791e19b01f31e86c93e5a603fd0c4b:/examples/msg/trace/trace.tesh

diff --git a/examples/msg/trace/trace.tesh b/examples/msg/trace/trace.tesh
index 548f62798f..3d14f38ef6 100644
--- a/examples/msg/trace/trace.tesh
+++ b/examples/msg/trace/trace.tesh
@@ -2,10 +2,10 @@
 
 p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -13,10 +13,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xm
 
 p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) 
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 850.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -25,10 +25,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xm
 
 p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) 
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 1980.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -36,10 +36,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xm
 
 p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -47,10 +47,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xm
 
 p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Task size: 850.000000
 > [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -58,10 +58,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xm
 
 p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time)
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task size: 1980.000000
 > [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -69,10 +69,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xm
 
 p Testing trace integration using file.trace and test7.xml, two process with same priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.500000
@@ -84,10 +84,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xm
 
 p Testing trace integration using file.trace and test8.xml, two process with different priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 2.500000
@@ -99,10 +99,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xm
 
 p Testing trace integration using file.trace and test9.xml, three process with same priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 400.000000
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 1.000000
@@ -118,10 +118,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xm
 
 p Testing trace integration using file.trace and test10.xml, three process with different priority
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 420.000000
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 2.000000
@@ -137,10 +137,10 @@ $ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.x
 
 p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1.
 
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 420.000000
 > [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 2.000000