From 112eeba1a23b6c08c196961d47193deb03d8a4d5 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 6 Jun 2007 15:36:19 +0000 Subject: [PATCH] Convert to tesh git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3575 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../mutual_exclusion/simple_token/Makefile.am | 1 + .../mutual_exclusion/simple_token/Makefile.in | 1 + .../mutual_exclusion/simple_token/test_rl.in | 39 +++++++++++-------- .../mutual_exclusion/simple_token/test_sg.in | 20 +++++----- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.am b/examples/gras/mutual_exclusion/simple_token/Makefile.am index a5d584e1fd..e7061280c0 100644 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.am +++ b/examples/gras/mutual_exclusion/simple_token/Makefile.am @@ -1,5 +1,6 @@ INCLUDES= -I$(top_srcdir)/include TESTS= test_rl test_sg +TESTS_ENVIRONMENT=../../../../tools/tesh/tesh EXTRA_DIST=simple_token.xml $(TESTS) # AUTOMAKE variable definition diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.in b/examples/gras/mutual_exclusion/simple_token/Makefile.in index dc70d88d2c..319c79db8c 100644 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.in +++ b/examples/gras/mutual_exclusion/simple_token/Makefile.in @@ -238,6 +238,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 = simple_token.xml $(TESTS) simple_token_simulator_SOURCES = _simple_token_simulator.c simple_token.c simple_token_simulator_LDADD = $(top_builddir)/src/libsimgrid.la diff --git a/examples/gras/mutual_exclusion/simple_token/test_rl.in b/examples/gras/mutual_exclusion/simple_token/test_rl.in index 6552284cc4..ac22b9f990 100755 --- a/examples/gras/mutual_exclusion/simple_token/test_rl.in +++ b/examples/gras/mutual_exclusion/simple_token/test_rl.in @@ -1,17 +1,22 @@ -#! @BASH@ -e -if [ x@EXEEXT@ = x ] ; then -# exenv="libtool --mode=execute valgrind --db-attach=yes --run-libc-freeres=no " -# exenv="libtool --mode=execute valgrind --run-libc-freeres=no " - exenv=$SG_TEST_EXENV -else - exenv=wine -fi - -$exenv ./simple_token_node@EXEEXT@ 4000 127.0.0.1 4010 --create-token $@ & -# $exenv ./simple_token_node@EXEEXT@ 4010 127.0.0.1 4000 $@ & -# exit 0 -$exenv ./simple_token_node@EXEEXT@ 4010 127.0.0.1 4020 $@ & -$exenv ./simple_token_node@EXEEXT@ 4020 127.0.0.1 4030 $@ & -$exenv ./simple_token_node@EXEEXT@ 4030 127.0.0.1 4040 $@ & -$exenv ./simple_token_node@EXEEXT@ 4040 127.0.0.1 4050 $@ & -$exenv ./simple_token_node@EXEEXT@ 4050 127.0.0.1 4000 $@ +& $SG_TEST_EXENV ./simple_token_node@EXEEXT@ 4000 127.0.0.1 4010 --create-token --log=root.fmt:%m%n $@ +> Create the token (with value 0) and send it to 127.0.0.1:4010 +> Begin a new loop. Still to do: 2 +> Begin a new loop. Still to do: 1 +> Begin a new loop. Still to do: 0 +> Shut down the token-ring. There was 17 hops. +> Exiting GRAS + +& $SG_TEST_EXENV ./simple_token_node@EXEEXT@ 4010 127.0.0.1 4020 --log=root.fmt:%m%n $@ +> Exiting GRAS + +& $SG_TEST_EXENV ./simple_token_node@EXEEXT@ 4020 127.0.0.1 4030 --log=root.fmt:%m%n $@ +> Exiting GRAS + +& $SG_TEST_EXENV ./simple_token_node@EXEEXT@ 4030 127.0.0.1 4040 --log=root.fmt:%m%n $@ +> Exiting GRAS + +& $SG_TEST_EXENV ./simple_token_node@EXEEXT@ 4040 127.0.0.1 4050 --log=root.fmt:%m%n $@ +> Exiting GRAS + +& $SG_TEST_EXENV ./simple_token_node@EXEEXT@ 4050 127.0.0.1 4000 --log=root.fmt:%m%n $@ +> Exiting GRAS diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg.in b/examples/gras/mutual_exclusion/simple_token/test_sg.in index 72bd0fea52..cfc8bd6d1b 100755 --- a/examples/gras/mutual_exclusion/simple_token/test_sg.in +++ b/examples/gras/mutual_exclusion/simple_token/test_sg.in @@ -1,10 +1,12 @@ -#! @BASH@ -if [ x@EXEEXT@ = x ] ; then -# exenv="libtool --mode=execute valgrind --run-libc-freeres=no --show-reachable=yes " - exenv=$SG_TEST_EXENV -else - exenv=wine -fi - -exec $exenv ./simple_token_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/simple_token.xml $@ +$ $SG_TEST_EXENV ./simple_token_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/simple_token.xml $@ +> [Tremblay:node:(1) 0.000000] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000 +> [Tremblay:node:(1) 0.011346] [SimpleToken/INFO] Begin a new loop. Still to do: 2 +> [Tremblay:node:(1) 0.022693] [SimpleToken/INFO] Begin a new loop. Still to do: 1 +> [Tremblay:node:(1) 0.034039] [SimpleToken/INFO] Begin a new loop. Still to do: 0 +> [Tremblay:node:(1) 0.034039] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops. +> [Fafard:node:(2) 1.028109] [gras/INFO] Exiting GRAS +> [Jupiter:node:(3) 1.030844] [gras/INFO] Exiting GRAS +> [Ginette:node:(4) 1.032083] [gras/INFO] Exiting GRAS +> [Bourassa:node:(5) 1.034039] [gras/INFO] Exiting GRAS +> [Tremblay:node:(1) 1.034039] [gras/INFO] Exiting GRAS -- 2.20.1