From 38f4a536df6269449c99a095334a4488db4bd5f0 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 12 Dec 2008 00:43:11 +0000 Subject: [PATCH] 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 --- teshsuite/simdag/basic0.tesh | 2 +- teshsuite/simdag/basic1.tesh | 2 +- teshsuite/simdag/basic2.tesh | 2 +- teshsuite/simdag/basic3.tesh | 2 +- teshsuite/simdag/basic4.tesh | 2 +- teshsuite/simdag/basic5.tesh | 2 +- teshsuite/simdag/basic6.tesh | 2 +- teshsuite/simdag/network/mxn/test_intra_all2all.tesh | 2 +- .../simdag/network/mxn/test_intra_independent_comm.tesh | 2 +- teshsuite/simdag/network/mxn/test_intra_scatter.tesh | 2 +- teshsuite/simdag/network/p2p/test_latency1.tesh | 6 +++--- teshsuite/simdag/network/p2p/test_latency2.tesh | 6 +++--- teshsuite/simdag/network/p2p/test_latency3.tesh | 6 +++--- teshsuite/simdag/network/p2p/test_latency_bound.tesh | 2 +- teshsuite/simdag/network/test_reinit_costs.tesh | 2 +- teshsuite/simdag/partask/test_comp_only_par.tesh | 4 ++-- teshsuite/simdag/partask/test_comp_only_seq.tesh | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh index f5cc097226..176fba7727 100644 --- 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 diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh index 3eb98cdfb7..db12dc1a46 100644 --- 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 diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh index d9cb860b0c..f4d9b966aa 100644 --- 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 diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh index 67e62d4568..b7c0818bc2 100644 --- 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 diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh index 151f7a1652..b81410e954 100644 --- 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 diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh index 9877e56887..35c563f790 100644 --- 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 diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh index e7d058f435..c4803e106c 100644 --- 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' diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh index 3c94a04960..1523fd8088 100644 --- 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 -$ 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 diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh index d783ca3328..d56f29caf2 100644 --- 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 -$ 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 diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh index 05575b1430..82f89a72a5 100644 --- 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 -$ 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 diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh index 52253d06c4..203847abc8 100644 --- 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 -$ 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 -$ 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 -$ 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 diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh index 5755fcbfb1..6136fc939c 100644 --- 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 -$ 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 -$ 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 -$ 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 diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh index 257788aea8..7a8e1da959 100644 --- 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 -$ 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 -$ 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 -$ 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 diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/test_latency_bound.tesh index f69803b13e..01ed7ab695 100644 --- 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 -$ 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 diff --git a/teshsuite/simdag/network/test_reinit_costs.tesh b/teshsuite/simdag/network/test_reinit_costs.tesh index ba02ac48d1..2a2d79d0c4 100644 --- a/teshsuite/simdag/network/test_reinit_costs.tesh +++ b/teshsuite/simdag/network/test_reinit_costs.tesh @@ -1,6 +1,6 @@ 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 diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh index cb76885584..0a4fa722a3 100644 --- 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 -$ 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 -$ 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 diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh index 33791da706..def752d808 100644 --- 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 -$ 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 -- 2.20.1