Move to tesh for the tests

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

diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am
index 1286fce..4d8f803 100644 (file)
--- a/examples/gras/ping/Makefile.am
+++ b/examples/gras/ping/Makefile.am
@@ -1,5 +1,7 @@
 INCLUDES= -I$(top_srcdir)/include
 TESTS= test_rl test_sg
+TESTS_ENVIRONMENT=../../../tools/tesh/tesh
+
 EXTRA_DIST=ping.xml ping.h $(TESTS)
 
 # AUTOMAKE variable definition

diff --git a/examples/gras/ping/Makefile.in b/examples/gras/ping/Makefile.in
index b212daa..298b25a 100644 (file)
--- a/examples/gras/ping/Makefile.in
+++ b/examples/gras/ping/Makefile.in
@@ -242,6 +242,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = -I$(top_srcdir)/include
 TESTS = test_rl test_sg
+TESTS_ENVIRONMENT = ../../../tools/tesh/tesh
 EXTRA_DIST = ping.xml ping.h $(TESTS)
 ping_simulator_SOURCES = _ping_simulator.c ping_server.c ping_client.c ping_common.c
 ping_simulator_LDADD = $(top_builddir)/src/libsimgrid.la

diff --git a/examples/gras/ping/test_rl.in b/examples/gras/ping/test_rl.in
index 3e325f5..268dfd8 100755 (executable)
--- a/examples/gras/ping/test_rl.in
+++ b/examples/gras/ping/test_rl.in
@@ -1,11 +1,24 @@
-#! @BASH@ -e
-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 ./ping_server@EXEEXT@ 4002 $@ &
-sleep 1
-$exenv ./ping_client@EXEEXT@ 127.0.0.1 4002 $@
+
+#! set timeout 20
+& $SG_TEST_ENV ./ping_server@EXEEXT@ 4002 --log=root.fmt=%m%n
+> Launch server (port=4002)
+> Messages registered
+> Messages registered
+> >>>>>>>> Listening on port 4002 <<<<<<<<
+> >>>>>>>> Got message PING(1234) from 127.0.0.1:0 <<<<<<<<
+> >>>>>>>> Answered with PONG(4321) <<<<<<<<
+> Done.
+> Exiting GRAS
+
+$ sleep 1
+
+#! set timeout 20
+& $SG_TEST_ENV ./ping_client@EXEEXT@ 127.0.0.1 4002 --log=root.fmt=%m%n
+> Launch client (server on 127.0.0.1:4002)
+> Connected to 127.0.0.1:4002.
+> Messages registered
+> >>>>>>>> Connected to server which is on 127.0.0.1:4002 <<<<<<<<
+> >>>>>>>> Message PING(1234) sent to 127.0.0.1:4002 <<<<<<<<
+> >>>>>>>> Got PONG(4321) from 127.0.0.1:4002 <<<<<<<<
+> Done.
+> Exiting GRAS

diff --git a/examples/gras/ping/test_sg.in b/examples/gras/ping/test_sg.in
index 8176f7f..097dbae 100755 (executable)
--- a/examples/gras/ping/test_sg.in
+++ b/examples/gras/ping/test_sg.in
@@ -1,9 +1,21 @@
-#! @BASH@
-if [ x@EXEEXT@ = x ] ; then 
-  exenv=$SG_TEST_EXENV
-else
-  exenv=wine
-fi
 
-exec $exenv ./ping_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/ping.xml $@
+p Runs the 'ping' test within the simulator
+
+$ ./ping_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/ping.xml
+> [Tremblay:server:(1) 0.000000] [Ping/INFO] Launch server (port=4000)
+> [Tremblay:server:(1) 0.000000] [Ping/INFO] Messages registered
+> [Tremblay:server:(1) 0.000000] [Ping/INFO] Messages registered
+> [Tremblay:server:(1) 0.000000] [Ping/INFO] >>>>>>>> Listening on port 4000 <<<<<<<<
+> [Fafard:client:(2) 0.000000] [Ping/INFO] Launch client (server on Tremblay:4000)
+> [Fafard:client:(2) 1.000000] [Ping/INFO] Connected to Tremblay:4000.
+> [Fafard:client:(2) 1.000000] [Ping/INFO] Messages registered
+> [Fafard:client:(2) 1.000000] [Ping/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<<
+> [Fafard:client:(2) 1.001977] [Ping/INFO] >>>>>>>> Message PING(1234) sent to Tremblay:4000 <<<<<<<<
+> [Tremblay:server:(1) 1.001977] [Ping/INFO] >>>>>>>> Got message PING(1234) from Fafard:0 <<<<<<<<
+> [Tremblay:server:(1) 1.003954] [Ping/INFO] >>>>>>>> Answered with PONG(4321) <<<<<<<<
+> [Tremblay:server:(1) 1.003954] [Ping/INFO] Done.
+> [Tremblay:server:(1) 1.003954] [gras/INFO] Exiting GRAS
+> [Fafard:client:(2) 1.003954] [Ping/INFO] >>>>>>>> Got PONG(4321) from Tremblay:4000 <<<<<<<<
+> [Fafard:client:(2) 1.003954] [Ping/INFO] Done.
+> [Fafard:client:(2) 1.003954] [gras/INFO] Exiting GRAS