From 33d399c1fa8847652ab2698ed6d7263bccb17447 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 6 Jun 2007 15:49:00 +0000 Subject: [PATCH 1/1] Convert to tesh git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3576 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/gras/mmrpc/Makefile.am | 1 + examples/gras/mmrpc/Makefile.in | 1 + examples/gras/mmrpc/mmrpc_client.c | 1 - examples/gras/mmrpc/mmrpc_server.c | 1 - examples/gras/mmrpc/test_rl.in | 24 +++++++++++++----------- examples/gras/mmrpc/test_sg.in | 17 +++++++++-------- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/examples/gras/mmrpc/Makefile.am b/examples/gras/mmrpc/Makefile.am index 440ef4adf6..d343f3a0fa 100644 --- a/examples/gras/mmrpc/Makefile.am +++ b/examples/gras/mmrpc/Makefile.am @@ -1,5 +1,6 @@ INCLUDES= -I$(top_srcdir)/include TESTS= test_rl test_sg +TESTS_ENVIRONMENT=../../../tools/tesh/tesh EXTRA_DIST=mmrpc.xml mmrpc.h $(TESTS) # AUTOMAKE variable definition diff --git a/examples/gras/mmrpc/Makefile.in b/examples/gras/mmrpc/Makefile.in index 9495e408e0..c792105de1 100644 --- a/examples/gras/mmrpc/Makefile.in +++ b/examples/gras/mmrpc/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 = mmrpc.xml mmrpc.h $(TESTS) mmrpc_simulator_SOURCES = _mmrpc_simulator.c mmrpc_common.c mmrpc_client.c mmrpc_server.c mmrpc_simulator_LDADD = $(top_builddir)/src/libsimgrid.la diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c index 2ebb675ece..4f52086002 100644 --- a/examples/gras/mmrpc/mmrpc_client.c +++ b/examples/gras/mmrpc/mmrpc_client.c @@ -94,6 +94,5 @@ int client(int argc,char *argv[]) { xbt_matrix_free(answer); gras_socket_close(toserver); gras_exit(); - INFO0("Done."); return 0; } /* end_of_client */ diff --git a/examples/gras/mmrpc/mmrpc_server.c b/examples/gras/mmrpc/mmrpc_server.c index eed3819540..95d70d5a3a 100644 --- a/examples/gras/mmrpc/mmrpc_server.c +++ b/examples/gras/mmrpc/mmrpc_server.c @@ -73,6 +73,5 @@ int server (int argc,char *argv[]) { gras_socket_close(sock); gras_exit(); - INFO0("Done."); return 0; } /* end_of_server */ diff --git a/examples/gras/mmrpc/test_rl.in b/examples/gras/mmrpc/test_rl.in index 75d74cf419..537566067a 100755 --- a/examples/gras/mmrpc/test_rl.in +++ b/examples/gras/mmrpc/test_rl.in @@ -1,11 +1,13 @@ -#! @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 ./mmrpc_server@EXEEXT@ 4002 $@ & -sleep 1 -$exenv ./mmrpc_client@EXEEXT@ 127.0.0.1 4002 $@ +& $SG_TEST_EXENV ./mmrpc_server@EXEEXT@ 4002 --log=root.fmt:%m%n +> Launch server (port=4002) +> Exiting GRAS + +$ sleep 1 + +$ $SG_TEST_EXENV ./mmrpc_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. +> >>>>>>>> Connected to server which is on 127.0.0.1:4002 <<<<<<<< +> >>>>>>>> Request sent to 127.0.0.1:4002 <<<<<<<< +> >>>>>>>> Got answer from 127.0.0.1:4002 (values are right) <<<<<<<< +> Exiting GRAS diff --git a/examples/gras/mmrpc/test_sg.in b/examples/gras/mmrpc/test_sg.in index 08d45b29ef..68768314ce 100755 --- a/examples/gras/mmrpc/test_sg.in +++ b/examples/gras/mmrpc/test_sg.in @@ -1,9 +1,10 @@ -#! @BASH@ -if [ x@EXEEXT@ = x ] ; then - exenv=$SG_TEST_EXENV -else - exenv=wine -fi - -exec $exenv ./mmrpc_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/mmrpc.xml $@ +$ $SG_TEST_EXENV ./mmrpc_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/mmrpc.xml $@ +> [Tremblay:server:(1) 0.000000] [MatMult/INFO] Launch server (port=4000) +> [Fafard:client:(2) 0.000000] [MatMult/INFO] Launch client (server on Tremblay:4000) +> [Fafard:client:(2) 1.000000] [MatMult/INFO] Connected to Tremblay:4000. +> [Fafard:client:(2) 1.000000] [MatMult/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<< +> [Fafard:client:(2) 1.053783] [MatMult/INFO] >>>>>>>> Request sent to Tremblay:4000 <<<<<<<< +> [Tremblay:server:(1) 1.081662] [gras/INFO] Exiting GRAS +> [Fafard:client:(2) 1.081662] [MatMult/INFO] >>>>>>>> Got answer from Tremblay:4000 (values are right) <<<<<<<< +> [Fafard:client:(2) 1.081662] [gras/INFO] Exiting GRAS -- 2.20.1