This way of passing arguments has changed since a long time.

Fixing all tesh files accordingly. Yet, now that this mechanism is
effective, absolute paths are output everywhere, hence the need to
hide just like we do for contexts. I wish I had a cleaner solution but
I don't.

diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh
index bd1328b33f285f68634e2e586d1a3f1baa283113..224a1f8eb71c725769c80cf3ddeaf2852255493d 100644 (file)
--- a/examples/msg/io/io.tesh
+++ b/examples/msg/io/io.tesh
@@ -1,7 +1,6 @@
 #! ./tesh
 
 $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 #! ./tesh
 
 $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Configuration change: Set 'path' to '../examples/platforms/'

 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file './doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (2:1@alice)     Open file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml'
 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file './doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (2:1@alice)     Open file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml'


@@ -30,7 +29,6 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.f
 > [  0.004786] (0:@) Simulation time 0.00478623
 
 $ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.004786] (0:@) Simulation time 0.00478623
 
 $ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Configuration change: Set 'path' to '../examples/platforms/'

 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file './doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (1:0@denise)    File stat ./doc/simgrid/examples/platforms/g5k.xml Size 17028.0
 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file './doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (1:0@denise)    File stat ./doc/simgrid/examples/platforms/g5k.xml Size 17028.0

diff --git a/src/xbt/config.c b/src/xbt/config.c
index cbe31a1631cba18915d7e29cd272850c11ff3c71..64082dbf10ed7575471d895ff5ce2bc3226ad08c 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -644,7 +644,7 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     }
     *(val++) = '\0';
 
     }
     *(val++) = '\0';
 

-    if (strncmp(name, "contexts/", strlen("contexts/")))
+    if (strncmp(name, "contexts/", strlen("contexts/")) && strncmp(name, "path", strlen("path")))

       XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
 
     TRY {
       XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
 
     TRY {

diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh
index 058880837ded48daa797a0aef53fd5eb137efe21..6229ec2b1707881f4a6da1436027caa370f016f1 100644 (file)
--- a/teshsuite/simdag/basic0.tesh
+++ b/teshsuite/simdag/basic0.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"

 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.800100] Simulation time: 0.800100
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.800100] Simulation time: 0.800100

diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh
index 44e5a7e119006d6865378b93df657d32a7aa87a5..c2b666d502191d602e7921c273c428aaa6694566 100644 (file)
--- a/teshsuite/simdag/basic1.tesh
+++ b/teshsuite/simdag/basic1.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic1 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/basic1 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > [ 16.000100] (0:@) Simulation time: 16.000100
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > [ 16.000100] (0:@) Simulation time: 16.000100

diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh
index 2614e4e17e374501d20546ba13f20fc9e76b97e0..9f15bc1886dbe52c0d2a8a2c96d6bd9c8c3c5606 100644 (file)
--- a/teshsuite/simdag/basic2.tesh
+++ b/teshsuite/simdag/basic2.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > [  8.800100] (0:@) Simulation time: 8.800100
\ No newline at end of file
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > [  8.800100] (0:@) Simulation time: 8.800100
\ No newline at end of file

diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh
index fb512dac843e1c3453c26722db9db4a051280ade..f1afcbddb593502a3acf50a2b165476f979e363f 100644 (file)
--- a/teshsuite/simdag/basic3.tesh
+++ b/teshsuite/simdag/basic3.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
+$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose

 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.000000] Starting simulation...
 > [  0.000000] Run simulation for -1.000000 seconds
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.000000] Starting simulation...
 > [  0.000000] Run simulation for -1.000000 seconds

diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh
index b6ca71ae1cf6b8975d0f6bd93e1198f1fcb30782..f7eda807216579950cc54db3e74dbac3402fbac4 100644 (file)
--- a/teshsuite/simdag/basic4.tesh
+++ b/teshsuite/simdag/basic4.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
+$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose

 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.000000] Starting simulation...
 > [  0.000000] Run simulation for -1.000000 seconds
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.000000] Starting simulation...
 > [  0.000000] Run simulation for -1.000000 seconds

diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh
index cdb06cbfd44dda120890021f7744790d721509f4..19ba94862cc2ec6879f615c27d66c5843c1c8b4b 100644 (file)
--- a/teshsuite/simdag/basic5.tesh
+++ b/teshsuite/simdag/basic5.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"

 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.002500] Simulation time: 0.002500
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.002500] Simulation time: 0.002500

diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh
index a4478e0b83269a558b9dd397199ee8dfcd2b4392..04d782fa5615bc83a2b680514492f4194b60096e 100644 (file)
--- a/teshsuite/simdag/basic6.tesh
+++ b/teshsuite/simdag/basic6.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"

 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  2.000000] Simulation time: 2.000000
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  2.000000] Simulation time: 2.000000

diff --git a/teshsuite/simdag/incomplete.tesh b/teshsuite/simdag/incomplete.tesh
index c237b85a025e3cd69b0698df3c5a27e59cf7418b..bd81be91a72310fdf5819a1e5381d06cf594a7ff 100644 (file)
--- a/teshsuite/simdag/incomplete.tesh
+++ b/teshsuite/simdag/incomplete.tesh
@@ -1,4 +1,4 @@
-$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"

 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  8.000100] Simulation is finished but 3 tasks are still not done
 > [  8.000100] Task C is in SD_NOT_SCHEDULED state
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  8.000100] Simulation is finished but 3 tasks are still not done
 > [  8.000100] Task C is in SD_NOT_SCHEDULED state

diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
index 4cd33039a7dcc38c5580d8c3947119d19e34a138..79003d9ae061bed0fc2176e429eb7cb54ff8808d 100644 (file)
--- a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
+++ b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
@@ -1,6 +1,6 @@
 
 p all 2 all test, only fat pipe switch is used concurrently
 
 
 p all 2 all test, only fat pipe switch is used concurrently
 

-$ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 8
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 8

diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh
index a23ab6b99ad0d41882c603bc8ab333984e8ff4ae..7063943900c9787d79233c7803648f64ffaeb11a 100644 (file)
--- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh
+++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh
@@ -1,6 +1,6 @@
 
 p sending on different paths test
 
 
 p sending on different paths test
 

-$ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 3
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 3

diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh
index 5a1391e7e8814327c42b8ec675084b388928db78..fe13de3d06b46b333a663e7eb0fd2642ff5559b7 100644 (file)
--- a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh
+++ b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh
@@ -1,6 +1,6 @@
 
 p scatter test
 
 
 p scatter test
 

-$ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 8
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 8

diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh
index f6f7588f398f0256705bd35121fe0f917c1e82f7..27b8b2cd25187b209ef881b4a97b8180df71af9c 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency1.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency1.tesh
@@ -1,18 +1,18 @@
 
 p latency check, 1 byte, shared link
 
 
 p latency check, 1 byte, shared link
 

-$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 1 byte, fat pipe
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 1 byte, fat pipe
 

-$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 1 byte, link - switch - link
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 1 byte, link - switch - link
 

-$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 3
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 3

diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh
index 5913cf13baaa229232a69ab2fde5592a3191e944..07787cc67db77df377a13e82e728a2061c775ffa 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency2.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency2.tesh
@@ -1,18 +1,18 @@
 
 p latency check, 2 x 1 byte, same direction, shared link
 
 
 p latency check, 2 x 1 byte, same direction, shared link
 

-$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 2.5
 
 p latency check, 2 x 1 byte, same direction, fat pipe
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 2.5
 
 p latency check, 2 x 1 byte, same direction, fat pipe
 

-$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 2 x 1 byte, same direction, link - switch - link
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 2 x 1 byte, same direction, link - switch - link
 

-$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 4
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 4

diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh
index d3a89139a78d7bd672416d34713e912716921c14..f083ac2ac6052c40a0393daa560d09da34463dea 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency3.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency3.tesh
@@ -1,18 +1,18 @@
 
 p latency check, 2 x 1 byte, opposite direction, shared link
 
 
 p latency check, 2 x 1 byte, opposite direction, shared link
 

-$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 2.5
 
 p latency check, 2 x 1 byte, opposite direction, fat pipe
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 2.5
 
 p latency check, 2 x 1 byte, opposite direction, fat pipe
 

-$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 2 x 1 byte, opposite direction, link - switch - link
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1.5
 
 p latency check, 2 x 1 byte, opposite direction, link - switch - link
 

-$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 4
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 4

diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/test_latency_bound.tesh
index a5c405382c34a469f4bed13eb0c65096b591daf2..bcce3ba74c6cac294f478dc77095a1b78f752ec8 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency_bound.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency_bound.tesh
@@ -1,6 +1,6 @@
 
 p latency bounded by large latency link
 
 
 p latency bounded by large latency link
 

-$ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 10001.5
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 10001.5

diff --git a/teshsuite/simdag/network/test_reinit_costs.tesh b/teshsuite/simdag/network/test_reinit_costs.tesh
index 8a375cdad14256f97f65a3fc3d6f9c6c09e70c35..305e4b9b68adff8bdd94b3f8f219c2fc0d42a100 100644 (file)
--- a/teshsuite/simdag/network/test_reinit_costs.tesh
+++ b/teshsuite/simdag/network/test_reinit_costs.tesh
@@ -1,7 +1,7 @@
 
 p Reinitialization test
 
 
 p Reinitialization test
 

-$ simdag/network/test_reinit_costs ${srcdir:=.}/simdag/network/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/network/test_reinit_costs ${srcdir:=.}/simdag/network/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 0
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 0
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07

diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh
index 51fa74e8fbfe32bb9efde12130952a43b39722c3..3467eb8f459f4f472d85be38dd6dbde6c9a1305b 100644 (file)
--- a/teshsuite/simdag/partask/test_comp_only_par.tesh
+++ b/teshsuite/simdag/partask/test_comp_only_par.tesh
@@ -1,12 +1,12 @@
 
 p par task comp only, no comm, homogeneous
 
 
 p par task comp only, no comm, homogeneous
 

-$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1
 
 p par task comp only, no comm, heterogeneous
 
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1
 
 p par task comp only, no comm, heterogeneous
 

-$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1

diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh
index 334b5381bec4d9e9f9a76a08d3144746446aaa91..85c429e4de104338895fcde48f5ae7772dc4e8df 100644 (file)
--- a/teshsuite/simdag/partask/test_comp_only_seq.tesh
+++ b/teshsuite/simdag/partask/test_comp_only_seq.tesh
@@ -1,6 +1,6 @@
 
 p seq task comp only, no comm
 
 
 p seq task comp only, no comm
 

-$ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 1

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index c83d2aed24458d796dd34bc1dd6e435cc16a73f9..32ab0211db242f2d7a4c044ab00eee90acd421b8 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -79,7 +79,6 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010'
 > [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 'maxmin/precision' to '0.000010'
 > [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 '~/'

 > Workstation number: 1, link number: 1
 
 $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI
 > Workstation number: 1, link number: 1
 
 $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI


@@ -88,7 +87,6 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010'
 > [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 'maxmin/precision' to '0.000010'
 > [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 '~/'

 > Workstation number: 1, link number: 1
 
 $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
 > Workstation number: 1, link number: 1
 
 $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml