Add --surf-path so that testing remains possible with vpath

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

diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh
index f5cc097..176fba7 100644 (file)
--- a/teshsuite/simdag/basic0.tesh
+++ b/teshsuite/simdag/basic0.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic0 simdag/basic_platform.xml
+$ simdag/basic0 simdag/basic_platform.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Init'
 > [0.000000] [sd_kernel/INFO] Task 'Init' done
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Init'
 > [0.000000] [sd_kernel/INFO] Task 'Init' done

diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh
index 3eb98cd..db12dc1 100644 (file)
--- a/teshsuite/simdag/basic1.tesh
+++ b/teshsuite/simdag/basic1.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic1 simdag/basic_platform.xml
+$ simdag/basic1 simdag/basic_platform.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Init'
 > [0.000000] [sd_kernel/INFO] Task 'Init' done
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Init'
 > [0.000000] [sd_kernel/INFO] Task 'Init' done

diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh
index d9cb860..f4d9b96 100644 (file)
--- a/teshsuite/simdag/basic2.tesh
+++ b/teshsuite/simdag/basic2.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic2 simdag/basic_platform.xml
+$ simdag/basic2 simdag/basic_platform.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Init'
 > [0.000000] [sd_kernel/INFO] Task 'Init' done
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Init'
 > [0.000000] [sd_kernel/INFO] Task 'Init' done

diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh
index 67e62d4..b7c0818 100644 (file)
--- a/teshsuite/simdag/basic3.tesh
+++ b/teshsuite/simdag/basic3.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic3 simdag/basic_platform.xml
+$ simdag/basic3 simdag/basic_platform.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done

diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh
index 151f7a1..b81410e 100644 (file)
--- a/teshsuite/simdag/basic4.tesh
+++ b/teshsuite/simdag/basic4.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic4 simdag/basic_platform.xml
+$ simdag/basic4 simdag/basic_platform.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done

diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh
index 9877e56..35c563f 100644 (file)
--- a/teshsuite/simdag/basic5.tesh
+++ b/teshsuite/simdag/basic5.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic5 simdag/basic_platform.xml
+$ simdag/basic5 simdag/basic_platform.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done

diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh
index e7d058f..c4803e1 100644 (file)
--- a/teshsuite/simdag/basic6.tesh
+++ b/teshsuite/simdag/basic6.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic6 simdag/network/p2p/platform_2p_1sl.xml
+$ simdag/basic6 simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir}

 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task A'
 > [0.000000] [sd_kernel/INFO] Executing task 'Task B'
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task A'
 > [0.000000] [sd_kernel/INFO] Executing task 'Task B'

diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
index 3c94a04..1523fd8 100644 (file)
--- a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
+++ b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
@@ -1,5 +1,5 @@
 
 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 simdag/network/mxn/platform_4p_1switch.xml --log=sd_kernel.thres=warning
+$ simdag/network/mxn/test_intra_all2all simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 8
 > 8

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

-$ simdag/network/mxn/test_intra_independent_comm simdag/network/mxn/platform_4p_1switch.xml --log=sd_kernel.thres=warning
+$ simdag/network/mxn/test_intra_independent_comm simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 3
 > 3

diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh
index 05575b1..82f89a7 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 simdag/network/mxn/platform_4p_1switch.xml --log=sd_kernel.thres=warning
+$ simdag/network/mxn/test_intra_scatter simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 8
 
 > 8
 

diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh
index 52253d0..203847a 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency1.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency1.tesh
@@ -1,16 +1,16 @@
 
 p latency check, 1 byte, shared link
 
 
 p latency check, 1 byte, shared link
 

-$ simdag/network/p2p/test_latency1 simdag/network/p2p/platform_2p_1sl.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency1 simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1.5
 
 p latency check, 1 byte, fat pipe
 
 > 1.5
 
 p latency check, 1 byte, fat pipe
 

-$ simdag/network/p2p/test_latency1 simdag/network/p2p/platform_2p_1fl.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency1 simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1.5
 
 p latency check, 1 byte, link - switch - link 
 
 > 1.5
 
 p latency check, 1 byte, link - switch - link 
 

-$ simdag/network/p2p/test_latency1 simdag/network/p2p/platform_2p_1switch.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency1 simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 3
 
 > 3
 

diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh
index 5755fcb..6136fc9 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency2.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency2.tesh
@@ -1,16 +1,16 @@
 
 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 simdag/network/p2p/platform_2p_1sl.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency2 simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 2.5
 
 p latency check, 2 x 1 byte, same direction, fat pipe
 
 > 2.5
 
 p latency check, 2 x 1 byte, same direction, fat pipe
 

-$ simdag/network/p2p/test_latency2 simdag/network/p2p/platform_2p_1fl.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency2 simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1.5
 
 p latency check, 2 x 1 byte, same direction, link - switch - link 
 
 > 1.5
 
 p latency check, 2 x 1 byte, same direction, link - switch - link 
 

-$ simdag/network/p2p/test_latency2 simdag/network/p2p/platform_2p_1switch.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency2 simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 4
 
 > 4
 

diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh
index 257788a..7a8e1da 100644 (file)
--- a/teshsuite/simdag/network/p2p/test_latency3.tesh
+++ b/teshsuite/simdag/network/p2p/test_latency3.tesh
@@ -1,16 +1,16 @@
 
 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 simdag/network/p2p/platform_2p_1sl.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency3 simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 2.5
 
 p latency check, 2 x 1 byte, opposite direction, fat pipe
 
 > 2.5
 
 p latency check, 2 x 1 byte, opposite direction, fat pipe
 

-$ simdag/network/p2p/test_latency3 simdag/network/p2p/platform_2p_1fl.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency3 simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1.5
 
 p latency check, 2 x 1 byte, opposite direction, link - switch - link 
 
 > 1.5
 
 p latency check, 2 x 1 byte, opposite direction, link - switch - link 
 

-$ simdag/network/p2p/test_latency3 simdag/network/p2p/platform_2p_1switch.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency3 simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 4
 
 > 4
 

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

-$ simdag/network/p2p/test_latency_bound simdag/network/p2p/platform_2p_1bb.xml --log=sd_kernel.thres=warning
+$ simdag/network/p2p/test_latency_bound simdag/network/p2p/platform_2p_1bb.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 10001.5
 > 10001.5

diff --git a/teshsuite/simdag/network/test_reinit_costs.tesh b/teshsuite/simdag/network/test_reinit_costs.tesh
index ba02ac4..2a2d79d 100644 (file)
--- a/teshsuite/simdag/network/test_reinit_costs.tesh
+++ b/teshsuite/simdag/network/test_reinit_costs.tesh
@@ -1,6 +1,6 @@
 
 p Reinitialization test
 
 
 p Reinitialization test
 

-$ simdag/network/test_reinit_costs simdag/network/platform_2p_1sl.xml --log=sd_kernel.thres=warning
+$ simdag/network/test_reinit_costs simdag/network/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 0
 > 1.5
 > 0
 > 1.5

diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh
index cb76885..0a4fa72 100644 (file)
--- a/teshsuite/simdag/partask/test_comp_only_par.tesh
+++ b/teshsuite/simdag/partask/test_comp_only_par.tesh
@@ -1,10 +1,10 @@
 
 p par task comp only, no comm, homogeneous
 
 
 p par task comp only, no comm, homogeneous
 

-$ simdag/partask/test_comp_only_par simdag/partask/platform_2p_1sl.xml --log=sd_kernel.thres=warning
+$ simdag/partask/test_comp_only_par simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1
 
 p par task comp only, no comm, heterogeneous
 
 > 1
 
 p par task comp only, no comm, heterogeneous
 

-$ simdag/partask/test_comp_only_par simdag/partask/platform_2p_1sl_hetero.xml --log=sd_kernel.thres=warning
+$ simdag/partask/test_comp_only_par simdag/partask/platform_2p_1sl_hetero.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1
 > 1

diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh
index 33791da..def752d 100644 (file)
--- a/teshsuite/simdag/partask/test_comp_only_seq.tesh
+++ b/teshsuite/simdag/partask/test_comp_only_seq.tesh
@@ -1,5 +1,5 @@
 
 p seq task comp only, no comm
 
 
 p seq task comp only, no comm
 

-$ simdag/partask/test_comp_only_seq simdag/partask/platform_2p_1sl.xml --log=sd_kernel.thres=warning
+$ simdag/partask/test_comp_only_seq simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning

 > 1
 > 1