From: degomme Date: Thu, 7 Aug 2014 14:08:24 +0000 (+0200) Subject: move platform file X-Git-Tag: v3_12~850^2~25 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/093f8c4d24fb698320a8a590ed458e1c97e1fbad move platform file --- diff --git a/teshsuite/simdag/basic/basic_platform.xml b/examples/platforms/two_hosts_platform_shared.xml similarity index 100% rename from teshsuite/simdag/basic/basic_platform.xml rename to examples/platforms/two_hosts_platform_shared.xml diff --git a/teshsuite/simdag/basic/basic1.tesh b/teshsuite/simdag/basic/basic1.tesh index 45dfc06546..9bb0088b90 100644 --- a/teshsuite/simdag/basic/basic1.tesh +++ b/teshsuite/simdag/basic/basic1.tesh @@ -1,3 +1,3 @@ -$ ${bindir:=.}/basic1 basic_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml "--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 diff --git a/teshsuite/simdag/basic/basic2.tesh b/teshsuite/simdag/basic/basic2.tesh index 4d17b7bb00..44554123cc 100644 --- a/teshsuite/simdag/basic/basic2.tesh +++ b/teshsuite/simdag/basic/basic2.tesh @@ -1,3 +1,3 @@ -$ ${bindir:=.}/basic2 basic_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic2 ../../../examples/platforms/two_hosts_platform_shared.xml "--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 diff --git a/teshsuite/simdag/basic/basic3.tesh b/teshsuite/simdag/basic/basic3.tesh index f17325f9df..89cab5eefe 100644 --- a/teshsuite/simdag/basic/basic3.tesh +++ b/teshsuite/simdag/basic/basic3.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/basic3 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose +$ ${bindir:=.}/basic3 ../../../examples/platforms/two_hosts_platform_shared.xml "--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 diff --git a/teshsuite/simdag/basic/basic4.tesh b/teshsuite/simdag/basic/basic4.tesh index 9e78db6d5c..c0fe5011b6 100644 --- a/teshsuite/simdag/basic/basic4.tesh +++ b/teshsuite/simdag/basic/basic4.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/basic4 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose +$ ${bindir:=.}/basic4 ../../../examples/platforms/two_hosts_platform_shared.xml "--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 diff --git a/teshsuite/simdag/basic/basic5.tesh b/teshsuite/simdag/basic/basic5.tesh index c3dd97fb19..3d42730670 100644 --- a/teshsuite/simdag/basic/basic5.tesh +++ b/teshsuite/simdag/basic/basic5.tesh @@ -1,3 +1,3 @@ -$ ${bindir:=.}/basic5 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n" +$ ${bindir:=.}/basic5 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" > [ 0.000000] surf_workstation_model_init_ptask_L07 > [ 0.002500] Simulation time: 0.002500 diff --git a/teshsuite/simdag/incomplete/incomplete.tesh b/teshsuite/simdag/incomplete/incomplete.tesh index 533641125a..0f1ab4b216 100644 --- a/teshsuite/simdag/incomplete/incomplete.tesh +++ b/teshsuite/simdag/incomplete/incomplete.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/incomplete ../basic/basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n" +$ ${bindir:=.}/incomplete ../../../examples/platforms/two_hosts_platform_shared.xml "--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