From 6bce4412f5f0304db461754d064bac23274bd31f Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 8 Jun 2007 14:56:48 +0000 Subject: [PATCH 1/1] New timeout syntax git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3597 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/gras/all2all/test_rl | 10 +++++----- examples/gras/pmm/test_rl | 20 ++++++++++---------- examples/gras/timer/test_rl | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/gras/all2all/test_rl b/examples/gras/all2all/test_rl index 43ee8611cd..b296d723d6 100755 --- a/examples/gras/all2all/test_rl +++ b/examples/gras/all2all/test_rl @@ -1,5 +1,5 @@ # The receivers, waiting for 5 messages -! set timeout 20 +! timeout 20 & $SG_TEST_EXENV ./all2all_receiver$EXEEXT 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) @@ -9,7 +9,7 @@ > Got Data from 127.0.0.1:0 (still 0 to go) > Exiting GRAS -! set timeout 20 +! timeout 20 & $SG_TEST_EXENV ./all2all_receiver$EXEEXT 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) @@ -19,7 +19,7 @@ > Got Data from 127.0.0.1:0 (still 0 to go) > Exiting GRAS -! set timeout 20 +! timeout 20 & $SG_TEST_EXENV ./all2all_receiver$EXEEXT 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) @@ -29,7 +29,7 @@ > Got Data from 127.0.0.1:0 (still 0 to go) > Exiting GRAS -! set timeout 20 +! timeout 20 & $SG_TEST_EXENV ./all2all_receiver$EXEEXT 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) @@ -39,7 +39,7 @@ > Got Data from 127.0.0.1:0 (still 0 to go) > Exiting GRAS -! set timeout 20 +! timeout 20 & $SG_TEST_EXENV ./all2all_receiver$EXEEXT 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) diff --git a/examples/gras/pmm/test_rl b/examples/gras/pmm/test_rl index 33e9cdbe43..9675167f79 100755 --- a/examples/gras/pmm/test_rl +++ b/examples/gras/pmm/test_rl @@ -1,42 +1,42 @@ # Ignore the output of slaves since it depends on the order of connexion -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 ! output ignore & $SG_TEST_EXENV ./pmm_slave$EXEEXT 127.0.0.1:4242 --log=root.fmt:%m%n -! set timeout 20 +! timeout 20 & $SG_TEST_EXENV ./pmm_master$EXEEXT 4242 --log=root.fmt:%m%n > Wait for peers for 5 sec > Got 9 pals diff --git a/examples/gras/timer/test_rl b/examples/gras/timer/test_rl index 1a159de50e..8c599c2b5c 100755 --- a/examples/gras/timer/test_rl +++ b/examples/gras/timer/test_rl @@ -1,4 +1,4 @@ -! set timeout 20 +! timeout 20 $ $SG_TEST_EXENV ./timer_client$EXEEXT --log=root.fmt:%m%n > Programming the repetitive_action with a frequency of 1.000000 sec > Programming the delayed_action for after 2.000000 sec -- 2.20.1