From df69932bb2b50828779ef804f85a16e6a84dfcd6 Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 1 Apr 2010 14:51:44 +0000 Subject: [PATCH] allow gras test to run in // git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7426 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/gras/all2all/test_rl | 30 ++++++++-------- examples/gras/mmrpc/test_rl | 16 ++++----- .../mutual_exclusion/simple_token/test_rl | 26 +++++++------- examples/gras/ping/test_rl | 18 +++++----- examples/gras/rpc/test_rl | 34 +++++++++---------- examples/gras/spawn/test_rl | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/gras/all2all/test_rl b/examples/gras/all2all/test_rl index eef12eaf69..bda53f2713 100755 --- a/examples/gras/all2all/test_rl +++ b/examples/gras/all2all/test_rl @@ -1,7 +1,7 @@ # The receivers, waiting for 5 messages ! timeout 20 -& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4000 5 --log=root.fmt:%m%n -> Listening on port 4000 (expecting 5 messages) +& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4400 5 --log=root.fmt:%m%n +> Listening on port 4400 (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) @@ -10,8 +10,8 @@ > Exiting GRAS ! timeout 20 -& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4001 5 --log=root.fmt:%m%n -> Listening on port 4001 (expecting 5 messages) +& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4401 5 --log=root.fmt:%m%n +> Listening on port 4401 (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) @@ -20,8 +20,8 @@ > Exiting GRAS ! timeout 20 -& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4002 5 --log=root.fmt:%m%n -> Listening on port 4002 (expecting 5 messages) +& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4402 5 --log=root.fmt:%m%n +> Listening on port 4402 (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) @@ -30,8 +30,8 @@ > Exiting GRAS ! timeout 20 -& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4003 5 --log=root.fmt:%m%n -> Listening on port 4003 (expecting 5 messages) +& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4403 5 --log=root.fmt:%m%n +> Listening on port 4403 (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) @@ -40,8 +40,8 @@ > Exiting GRAS ! timeout 20 -& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4004 5 --log=root.fmt:%m%n -> Listening on port 4004 (expecting 5 messages) +& $SG_TEST_EXENV ./all2all_receiver$EXEEXT 4404 5 --log=root.fmt:%m%n +> Listening on port 4404 (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) @@ -50,7 +50,7 @@ > Exiting GRAS # Five time a sender -$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 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 +$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4400 127.0.0.1:4401 127.0.0.1:4402 127.0.0.1:4403 127.0.0.1:4404 512 --log=root.fmt:%m%n > Launch current node > Sent Data > Sent Data @@ -59,7 +59,7 @@ $ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1 > Sent Data > Exiting GRAS -$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 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 +$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4400 127.0.0.1:4401 127.0.0.1:4402 127.0.0.1:4403 127.0.0.1:4404 512 --log=root.fmt:%m%n > Launch current node > Sent Data > Sent Data @@ -68,7 +68,7 @@ $ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1 > Sent Data > Exiting GRAS -$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 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 +$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4400 127.0.0.1:4401 127.0.0.1:4402 127.0.0.1:4403 127.0.0.1:4404 512 --log=root.fmt:%m%n > Launch current node > Sent Data > Sent Data @@ -77,7 +77,7 @@ $ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1 > Sent Data > Exiting GRAS -$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 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 +$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4400 127.0.0.1:4401 127.0.0.1:4402 127.0.0.1:4403 127.0.0.1:4404 512 --log=root.fmt:%m%n > Launch current node > Sent Data > Sent Data @@ -86,7 +86,7 @@ $ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4000 127.0.0.1:4001 127.0.0.1 > Sent Data > Exiting GRAS -$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 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 +$ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4400 127.0.0.1:4401 127.0.0.1:4402 127.0.0.1:4403 127.0.0.1:4404 512 --log=root.fmt:%m%n > Launch current node > Sent Data > Sent Data diff --git a/examples/gras/mmrpc/test_rl b/examples/gras/mmrpc/test_rl index 1b857f0983..92b720aa55 100755 --- a/examples/gras/mmrpc/test_rl +++ b/examples/gras/mmrpc/test_rl @@ -1,11 +1,11 @@ -& $SG_TEST_EXENV ./mmrpc_server$EXEEXT 4002 --log=root.fmt:%m%n -> Launch server (port=4002) +& $SG_TEST_EXENV ./mmrpc_server$EXEEXT 4502 --log=root.fmt:%m%n +> Launch server (port=4502) > Exiting GRAS -$ $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) <<<<<<<< +$ $SG_TEST_EXENV ./mmrpc_client$EXEEXT 127.0.0.1 4502 --log=root.fmt:%m%n +> Launch client (server on 127.0.0.1:4502) +> Connected to 127.0.0.1:4502. +> >>>>>>>> Connected to server which is on 127.0.0.1:4502 <<<<<<<< +> >>>>>>>> Request sent to 127.0.0.1:4502 <<<<<<<< +> >>>>>>>> Got answer from 127.0.0.1:4502 (values are right) <<<<<<<< > Exiting GRAS diff --git a/examples/gras/mutual_exclusion/simple_token/test_rl b/examples/gras/mutual_exclusion/simple_token/test_rl index 86cba97c09..483a5ca5b7 100755 --- a/examples/gras/mutual_exclusion/simple_token/test_rl +++ b/examples/gras/mutual_exclusion/simple_token/test_rl @@ -1,28 +1,28 @@ -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4000 127.0.0.1 4010 --create-token --log=root.fmt:%m%n $@ -> Launch node listening on 4000 (successor on 127.0.0.1:4010) -> Create the token (with value 0) and send it to 127.0.0.1:4010 +& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4100 127.0.0.1 4110 --create-token --log=root.fmt:%m%n $@ +> Launch node listening on 4100 (successor on 127.0.0.1:4110) +> Create the token (with value 0) and send it to 127.0.0.1:4110 > 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 $@ -> Launch node listening on 4010 (successor on 127.0.0.1:4020) +& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4110 127.0.0.1 4120 --log=root.fmt:%m%n $@ +> Launch node listening on 4110 (successor on 127.0.0.1:4120) > Exiting GRAS -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4020 127.0.0.1 4030 --log=root.fmt:%m%n $@ -> Launch node listening on 4020 (successor on 127.0.0.1:4030) +& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4120 127.0.0.1 4130 --log=root.fmt:%m%n $@ +> Launch node listening on 4120 (successor on 127.0.0.1:4130) > Exiting GRAS -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4030 127.0.0.1 4040 --log=root.fmt:%m%n $@ -> Launch node listening on 4030 (successor on 127.0.0.1:4040) +& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4130 127.0.0.1 4141 --log=root.fmt:%m%n $@ +> Launch node listening on 4130 (successor on 127.0.0.1:4141) > Exiting GRAS -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4040 127.0.0.1 4050 --log=root.fmt:%m%n $@ -> Launch node listening on 4040 (successor on 127.0.0.1:4050) +& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4141 127.0.0.1 4150 --log=root.fmt:%m%n $@ +> Launch node listening on 4141 (successor on 127.0.0.1:4150) > Exiting GRAS -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4050 127.0.0.1 4000 --log=root.fmt:%m%n $@ -> Launch node listening on 4050 (successor on 127.0.0.1:4000) +& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4150 127.0.0.1 4100 --log=root.fmt:%m%n $@ +> Launch node listening on 4150 (successor on 127.0.0.1:4100) > Exiting GRAS diff --git a/examples/gras/ping/test_rl b/examples/gras/ping/test_rl index b494e00128..a52e91dba6 100755 --- a/examples/gras/ping/test_rl +++ b/examples/gras/ping/test_rl @@ -1,22 +1,22 @@ ! timeout 20 -& $SG_TEST_ENV ./ping_server$EXEEXT 4002 --log=root.fmt=%P:%t%e%m%n $ARGS -> server:main Launch server (port=4002) +& $SG_TEST_ENV ./ping_server$EXEEXT 4302 --log=root.fmt=%P:%t%e%m%n $ARGS +> server:main Launch server (port=4302) > server:main Messages registered > server:main Messages registered -> server:main >>>>>>>> Listening on port 4002 <<<<<<<< +> server:main >>>>>>>> Listening on port 4302 <<<<<<<< > server:main >>>>>>>> Got message PING(1234) from 127.0.0.1:0 <<<<<<<< > server:main >>>>>>>> Answered with PONG(4321) <<<<<<<< > server:main Done. > server:main Exiting GRAS ! timeout 20 -& $SG_TEST_ENV ./ping_client$EXEEXT 127.0.0.1 4002 --log=root.fmt=%P:%t%e%m%n $ARGS -> client:main Launch client (server on 127.0.0.1:4002) -> client:main Connected to 127.0.0.1:4002. +& $SG_TEST_ENV ./ping_client$EXEEXT 127.0.0.1 4302 --log=root.fmt=%P:%t%e%m%n $ARGS +> client:main Launch client (server on 127.0.0.1:4302) +> client:main Connected to 127.0.0.1:4302. > client:main Messages registered -> client:main >>>>>>>> Connected to server which is on 127.0.0.1:4002 <<<<<<<< -> client:main >>>>>>>> Message PING(1234) sent to 127.0.0.1:4002 <<<<<<<< -> client:main >>>>>>>> Got PONG(4321) from 127.0.0.1:4002 <<<<<<<< +> client:main >>>>>>>> Connected to server which is on 127.0.0.1:4302 <<<<<<<< +> client:main >>>>>>>> Message PING(1234) sent to 127.0.0.1:4302 <<<<<<<< +> client:main >>>>>>>> Got PONG(4321) from 127.0.0.1:4302 <<<<<<<< > client:main Done. > client:main Exiting GRAS diff --git a/examples/gras/rpc/test_rl b/examples/gras/rpc/test_rl index 35ea317464..512221b5c6 100755 --- a/examples/gras/rpc/test_rl +++ b/examples/gras/rpc/test_rl @@ -1,6 +1,6 @@ -& $SG_TEST_EXENV ./rpc_server$EXEEXT 4002 --log=root.fmt:%m%n $@ -> Launch server (port=4002) -> Listening on port 4002 +& $SG_TEST_EXENV ./rpc_server$EXEEXT 4202 --log=root.fmt:%m%n $@ +> Launch server (port=4202) +> Listening on port 4202 > Got message PING(1234) from 127.0.0.1:0 > Answered with PONG(4321) > Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:0 @@ -9,17 +9,17 @@ > Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:0 > Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:0 > Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:0 -> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4003 -> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4003 -> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4003 -> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4003 -> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4003 +> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4203 +> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4203 +> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4203 +> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4203 +> Propagate local exception ('Error for the client') from 'raise exception' RPC cb back to 127.0.0.1:4203 > Asked to die by 127.0.0.1:0 > Done. > Exiting GRAS -& $SG_TEST_EXENV ./rpc_forwarder$EXEEXT 4003 127.0.0.1 4002 --log=root.fmt:%m%n $@ -> Launch forwarder (port=4003) +& $SG_TEST_EXENV ./rpc_forwarder$EXEEXT 4203 127.0.0.1 4202 --log=root.fmt:%m%n $@ +> Launch forwarder (port=4203) > Forward a request > Propagate remote exception ('Error for the client') from 'forward exception' RPC cb back to 127.0.0.1:0 > Forward a request @@ -34,11 +34,11 @@ > Done. > Exiting GRAS -& $SG_TEST_EXENV ./rpc_client$EXEEXT 127.0.0.1 4002 127.0.0.1 4003 --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 -> The answer to PING(1234) on 127.0.0.1:4002 is PONG(4321) +& $SG_TEST_EXENV ./rpc_client$EXEEXT 127.0.0.1 4202 127.0.0.1 4203 --log=root.fmt:%m%n $@ +> Launch client (server on 127.0.0.1:4202) +> Connected to 127.0.0.1:4202. +> Connected to server which is on 127.0.0.1:4202 +> The answer to PING(1234) on 127.0.0.1:4202 is PONG(4321) > Call the exception raising RPC > Got the expected exception when calling the exception raising RPC > Called the exception raising RPC @@ -57,7 +57,7 @@ > Got the expected exception when calling the exception raising RPC > Call the exception raising RPC on the forwarder (i=4) > Got the expected exception when calling the exception raising RPC -> Ask 127.0.0.1:4003 to die -> Ask 127.0.0.1:4002 to die +> Ask 127.0.0.1:4203 to die +> Ask 127.0.0.1:4202 to die > Done. > Exiting GRAS diff --git a/examples/gras/spawn/test_rl b/examples/gras/spawn/test_rl index 3ca339509b..7fe56f8b95 100755 --- a/examples/gras/spawn/test_rl +++ b/examples/gras/spawn/test_rl @@ -1,4 +1,4 @@ ! expect signal SIGABRT ! output ignore -$ $SG_TEST_ENV ./spawn_father$EXEEXT 4002 5 --log=root.fmt=%m%n +$ $SG_TEST_ENV ./spawn_father$EXEEXT 4602 5 --log=root.fmt=%m%n -- 2.20.1