Convert to tesh

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

diff --git a/examples/gras/all2all/Makefile.am b/examples/gras/all2all/Makefile.am
index efb6981..846340b 100644 (file)
--- a/examples/gras/all2all/Makefile.am
+++ b/examples/gras/all2all/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
-TESTS= test_sg test_rl
+TESTS= test_rl test_sg
+TESTS_ENVIRONMENT=../../../tools/tesh/tesh
 EXTRA_DIST=all2all.xml test_sg.in test_rl.in
 
 # AUTOMAKE variable definition

diff --git a/examples/gras/all2all/Makefile.in b/examples/gras/all2all/Makefile.in
index 875e4c2..dbd0992 100644 (file)
--- a/examples/gras/all2all/Makefile.in
+++ b/examples/gras/all2all/Makefile.in
@@ -240,7 +240,8 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = -I$(top_srcdir)/include
-TESTS = test_sg test_rl
+TESTS = test_rl test_sg
+TESTS_ENVIRONMENT = ../../../tools/tesh/tesh
 EXTRA_DIST = all2all.xml test_sg.in test_rl.in
 all2all_simulator_SOURCES = _all2all_simulator.c all2all.c 
 all2all_simulator_LDADD = $(top_builddir)/src/libsimgrid.la

diff --git a/examples/gras/all2all/all2all.c b/examples/gras/all2all/all2all.c
index f2f2ba1..df7ada5 100644 (file)
--- a/examples/gras/all2all/all2all.c
+++ b/examples/gras/all2all/all2all.c
@@ -110,15 +110,19 @@ int sender (int argc,char *argv[]) {
 
 
   /* Wait for receivers to startup */
-  gras_os_sleep(1);
+  gras_os_sleep(.01);
 
   /* write 'em */
   xbt_dynar_foreach(peers,i,h) {
      
      peer = gras_socket_client(h->name,h->port);
      gras_msg_send(peer,"data",&data);
-     INFO2("  Sent Data from %s to %s",
-          gras_os_myname(),h->name);
+     if (gras_if_SG()) {
+       INFO2("  Sent Data from %s to %s", gras_os_myname(),h->name);
+     } else {
+       INFO0("  Sent Data");
+     }     
+      
      gras_socket_close(peer);
   }
 

diff --git a/examples/gras/all2all/test_rl.in b/examples/gras/all2all/test_rl.in
index 2303ff9..d2e4900 100755 (executable)
--- a/examples/gras/all2all/test_rl.in
+++ b/examples/gras/all2all/test_rl.in
@@ -1,22 +1,99 @@
-#! @BASH@ -e 
-set -m
-if [ x@EXEEXT@ = x ] ; then 
-#  exenv="libtool --mode=execute valgrind --show-reachable=yes --run-libc-freeres=no "
-  exenv=$SG_TEST_EXENV
-else
-  exenv=wine
-fi
-
-$exenv ./all2all_receiver 4000 5&
-$exenv ./all2all_receiver 4001 5&
-$exenv ./all2all_receiver 4002 5&
-$exenv ./all2all_receiver 4003 5&
-$exenv ./all2all_receiver 4004 5&
-sleep 1
-receivers="127.0.0.1:4000 127.0.0.1:4001 127.0.0.1:4002 127.0.0.1:4003 127.0.0.1:4004"
-$exenv ./all2all_sender $receivers 512&
-$exenv ./all2all_sender $receivers 512&
-$exenv ./all2all_sender $receivers 512&
-$exenv ./all2all_sender $receivers 512&
-$exenv ./all2all_sender $receivers 512&
+# The receivers, waiting for 5 messages
+! set timeout 20
+& $SG_TEST_EXENV ./all2all_receiver 4000 5 --log=root.fmt:%m%n
+> Listening on port 4000 (expecting 5 messages)
+> Got Data from 127.0.0.1:0 (still 4 to go)
+> Got Data from 127.0.0.1:0 (still 3 to go)
+> Got Data from 127.0.0.1:0 (still 2 to go)
+> Got Data from 127.0.0.1:0 (still 1 to go)
+> Got Data from 127.0.0.1:0 (still 0 to go)
+> Exiting GRAS
+
+! set timeout 20
+& $SG_TEST_EXENV ./all2all_receiver 4001 5 --log=root.fmt:%m%n
+> Listening on port 4001 (expecting 5 messages)
+> Got Data from 127.0.0.1:0 (still 4 to go)
+> Got Data from 127.0.0.1:0 (still 3 to go)
+> Got Data from 127.0.0.1:0 (still 2 to go)
+> Got Data from 127.0.0.1:0 (still 1 to go)
+> Got Data from 127.0.0.1:0 (still 0 to go)
+> Exiting GRAS
+
+! set timeout 20
+& $SG_TEST_EXENV ./all2all_receiver 4002 5 --log=root.fmt:%m%n
+> Listening on port 4002 (expecting 5 messages)
+> Got Data from 127.0.0.1:0 (still 4 to go)
+> Got Data from 127.0.0.1:0 (still 3 to go)
+> Got Data from 127.0.0.1:0 (still 2 to go)
+> Got Data from 127.0.0.1:0 (still 1 to go)
+> Got Data from 127.0.0.1:0 (still 0 to go)
+> Exiting GRAS
+
+! set timeout 20
+& $SG_TEST_EXENV ./all2all_receiver 4003 5 --log=root.fmt:%m%n
+> Listening on port 4003 (expecting 5 messages)
+> Got Data from 127.0.0.1:0 (still 4 to go)
+> Got Data from 127.0.0.1:0 (still 3 to go)
+> Got Data from 127.0.0.1:0 (still 2 to go)
+> Got Data from 127.0.0.1:0 (still 1 to go)
+> Got Data from 127.0.0.1:0 (still 0 to go)
+> Exiting GRAS
+
+! set timeout 20
+& $SG_TEST_EXENV ./all2all_receiver 4004 5 --log=root.fmt:%m%n
+> Listening on port 4004 (expecting 5 messages)
+> Got Data from 127.0.0.1:0 (still 4 to go)
+> Got Data from 127.0.0.1:0 (still 3 to go)
+> Got Data from 127.0.0.1:0 (still 2 to go)
+> Got Data from 127.0.0.1:0 (still 1 to go)
+> Got Data from 127.0.0.1:0 (still 0 to go)
+> Exiting GRAS
+
+$ sleep 1
+
+# Five time a sender
+$ $SG_TEST_EXENV ./all2all_sender 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1:4002 127.0.0.1:4003 127.0.0.1:4004 512 --log=root.fmt:%m%n
+> Launch current node
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+> Exiting GRAS
+
+$ $SG_TEST_EXENV ./all2all_sender 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1:4002 127.0.0.1:4003 127.0.0.1:4004 512 --log=root.fmt:%m%n
+> Launch current node
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+> Exiting GRAS
+
+$ $SG_TEST_EXENV ./all2all_sender 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1:4002 127.0.0.1:4003 127.0.0.1:4004 512 --log=root.fmt:%m%n
+> Launch current node
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+> Exiting GRAS
+
+$ $SG_TEST_EXENV ./all2all_sender 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1:4002 127.0.0.1:4003 127.0.0.1:4004 512 --log=root.fmt:%m%n
+> Launch current node
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+> Exiting GRAS
+
+$ $SG_TEST_EXENV ./all2all_sender 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1:4002 127.0.0.1:4003 127.0.0.1:4004 512 --log=root.fmt:%m%n
+> Launch current node
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+>   Sent Data
+> Exiting GRAS
 

diff --git a/examples/gras/all2all/test_sg.in b/examples/gras/all2all/test_sg.in
index 0b66740..1e60515 100755 (executable)
--- a/examples/gras/all2all/test_sg.in
+++ b/examples/gras/all2all/test_sg.in
@@ -1,9 +1,61 @@
-#! @BASH@
-if [ x@EXEEXT@ = x ] ; then 
-  exenv=$SG_TEST_EXENV
-else
-  exenv=wine
-fi
-
-exec $exenv ./all2all_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/all2all.xml $@
-
+$ $SG_TEST_EXENV ./all2all_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/all2all.xml 
+> [Tremblay:sender:(1) 0.000000] [all2all/INFO] Launch current node
+> [Tremblay:receiver:(2) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
+> [Jupiter:sender:(3) 0.000000] [all2all/INFO] Launch current node
+> [Jupiter:receiver:(4) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
+> [Fafard:sender:(5) 0.000000] [all2all/INFO] Launch current node
+> [Fafard:receiver:(6) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
+> [Ginette:sender:(7) 0.000000] [all2all/INFO] Launch current node
+> [Ginette:receiver:(8) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
+> [Bourassa:sender:(9) 0.000000] [all2all/INFO] Launch current node
+> [Bourassa:receiver:(10) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
+> [Jupiter:sender:(3) 0.011604] [all2all/INFO]   Sent Data from Jupiter to Tremblay
+> [Tremblay:sender:(1) 0.011604] [all2all/INFO]   Sent Data from Tremblay to Jupiter
+> [Tremblay:receiver:(2) 0.011604] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Jupiter:receiver:(4) 0.011604] [all2all/INFO] Got Data from Tremblay:0 (still 3 to go)
+> [Fafard:sender:(5) 0.013681] [all2all/INFO]   Sent Data from Fafard to Tremblay
+> [Tremblay:receiver:(2) 0.013681] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Ginette:sender:(7) 0.015019] [all2all/INFO]   Sent Data from Ginette to Tremblay
+> [Tremblay:receiver:(2) 0.015019] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
+> [Jupiter:sender:(3) 0.015218] [all2all/INFO]   Sent Data from Jupiter to Fafard
+> [Fafard:receiver:(6) 0.015218] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Bourassa:sender:(9) 0.017074] [all2all/INFO]   Sent Data from Bourassa to Tremblay
+> [Tremblay:receiver:(2) 0.017074] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go)
+> [Tremblay:receiver:(2) 0.017074] [gras/INFO] Exiting GRAS
+> [Fafard:sender:(5) 0.017295] [all2all/INFO]   Sent Data from Fafard to Jupiter
+> [Tremblay:sender:(1) 0.017295] [all2all/INFO]   Sent Data from Tremblay to Fafard
+> [Jupiter:receiver:(4) 0.017295] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Fafard:receiver:(6) 0.017295] [all2all/INFO] Got Data from Tremblay:0 (still 2 to go)
+> [Jupiter:sender:(3) 0.018092] [all2all/INFO]   Sent Data from Jupiter to Ginette
+> [Ginette:receiver:(8) 0.018092] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Fafard:sender:(5) 0.019416] [all2all/INFO]   Sent Data from Fafard to Ginette
+> [Ginette:receiver:(8) 0.019416] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Ginette:sender:(7) 0.020169] [all2all/INFO]   Sent Data from Ginette to Jupiter
+> [Jupiter:receiver:(4) 0.020169] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
+> [Tremblay:sender:(1) 0.020754] [all2all/INFO]   Sent Data from Tremblay to Ginette
+> [Ginette:receiver:(8) 0.020754] [all2all/INFO] Got Data from Tremblay:0 (still 1 to go)
+> [Ginette:sender:(7) 0.021494] [all2all/INFO]   Sent Data from Ginette to Fafard
+> [Fafard:receiver:(6) 0.021494] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
+> [Jupiter:sender:(3) 0.021684] [all2all/INFO]   Sent Data from Jupiter to Bourassa
+> [Jupiter:sender:(3) 0.021684] [gras/INFO] Exiting GRAS
+> [Bourassa:receiver:(10) 0.021684] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Fafard:sender:(5) 0.022267] [all2all/INFO]   Sent Data from Fafard to Bourassa
+> [Fafard:sender:(5) 0.022267] [gras/INFO] Exiting GRAS
+> [Bourassa:receiver:(10) 0.022267] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Bourassa:sender:(9) 0.023761] [all2all/INFO]   Sent Data from Bourassa to Jupiter
+> [Jupiter:receiver:(4) 0.023761] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go)
+> [Jupiter:receiver:(4) 0.023761] [gras/INFO] Exiting GRAS
+> [Tremblay:sender:(1) 0.024343] [all2all/INFO]   Sent Data from Tremblay to Bourassa
+> [Tremblay:sender:(1) 0.024343] [gras/INFO] Exiting GRAS
+> [Bourassa:receiver:(10) 0.024343] [all2all/INFO] Got Data from Tremblay:0 (still 1 to go)
+> [Bourassa:sender:(9) 0.024345] [all2all/INFO]   Sent Data from Bourassa to Fafard
+> [Fafard:receiver:(6) 0.024345] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go)
+> [Fafard:receiver:(6) 0.024345] [gras/INFO] Exiting GRAS
+> [Ginette:sender:(7) 0.025670] [all2all/INFO]   Sent Data from Ginette to Bourassa
+> [Ginette:sender:(7) 0.025670] [gras/INFO] Exiting GRAS
+> [Bourassa:sender:(9) 0.025670] [all2all/INFO]   Sent Data from Bourassa to Ginette
+> [Bourassa:sender:(9) 0.025670] [gras/INFO] Exiting GRAS
+> [Bourassa:receiver:(10) 0.025670] [all2all/INFO] Got Data from Ginette:0 (still 0 to go)
+> [Bourassa:receiver:(10) 0.025670] [gras/INFO] Exiting GRAS
+> [Ginette:receiver:(8) 0.025670] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go)
+> [Ginette:receiver:(8) 0.025670] [gras/INFO] Exiting GRAS