From: navarro <navarro@caraja.(none)>
Date: Fri, 27 Apr 2012 11:16:03 +0000 (+0200)
Subject: Ajout de tests pour kill et start time
X-Git-Tag: v3_7~35^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/26359adbac8131d66a5bbc4ba157438b47f7d9f9?ds=sidebyside

Ajout de tests pour kill et start time
---

diff --git a/examples/msg/start_kill_time/deployment.xml b/examples/msg/start_kill_time/deployment.xml
new file mode 100644
index 0000000000..77a7713333
--- /dev/null
+++ b/examples/msg/start_kill_time/deployment.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+    <process host="c-0.me" function="master"/>
+  	<process host="c-1.me" function="slave"/>
+	<process host="c-2.me" function="slave"/>
+	<process host="c-3.me" function="slave"/>
+	<process host="c-4.me" function="slave"/>
+	<process host="c-5.me" function="slave"/>
+</platform>
\ No newline at end of file
diff --git a/examples/msg/start_kill_time/deployment_kill.xml b/examples/msg/start_kill_time/deployment_kill.xml
new file mode 100644
index 0000000000..c8fe38cfcc
--- /dev/null
+++ b/examples/msg/start_kill_time/deployment_kill.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+    <process host="c-0.me" function="master"/>
+  	<process host="c-1.me" function="slave" kill_time="6"/>
+	<process host="c-2.me" function="slave" kill_time="6"/>
+	<process host="c-3.me" function="slave" kill_time="6"/>
+	<process host="c-4.me" function="slave" kill_time="6"/>
+	<process host="c-5.me" function="slave" kill_time="6"/>
+</platform>
\ No newline at end of file
diff --git a/examples/msg/start_kill_time/start_kill_time.tesh b/examples/msg/start_kill_time/start_kill_time.tesh
index 05d0750b54..f54c9d6faa 100644
--- a/examples/msg/start_kill_time/start_kill_time.tesh
+++ b/examples/msg/start_kill_time/start_kill_time.tesh
@@ -1,5 +1,22 @@
 #! ./tesh
 
+p Test0 Process without time
+
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:master@c-0.me) Hello!
+> [  0.000000] (2:slave@c-1.me) Hello!
+> [  0.000000] (3:slave@c-2.me) Hello!
+> [  0.000000] (4:slave@c-3.me) Hello!
+> [  0.000000] (5:slave@c-4.me) Hello!
+> [  0.000000] (6:slave@c-5.me) Hello!
+> [ 10.000000] (6:slave@c-5.me) OK, goodbye now.
+> [ 10.000000] (1:master@c-0.me) OK, goodbye now.
+> [ 10.000000] (2:slave@c-1.me) OK, goodbye now.
+> [ 10.000000] (3:slave@c-2.me) OK, goodbye now.
+> [ 10.000000] (4:slave@c-3.me) OK, goodbye now.
+> [ 10.000000] (5:slave@c-4.me) OK, goodbye now.
+> [ 10.000000] (0:@) Simulation time 10
+
 p Test1 Process with start time
 
 $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
@@ -17,6 +34,18 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat
 > [ 15.000000] (6:slave@c-5.me) OK, goodbye now.
 > [ 15.000000] (0:@) Simulation time 15
 
+p Test1 Process with kill time
+
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:master@c-0.me) Hello!
+> [  0.000000] (2:slave@c-1.me) Hello!
+> [  0.000000] (3:slave@c-2.me) Hello!
+> [  0.000000] (4:slave@c-3.me) Hello!
+> [  0.000000] (5:slave@c-4.me) Hello!
+> [  0.000000] (6:slave@c-5.me) Hello!
+> [ 10.000000] (1:master@c-0.me) OK, goodbye now.
+> [ 10.000000] (0:@) Simulation time 10
+
 p Test2 Process with start and kill times
 
 $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"