From: Arnaud Giersch Date: Thu, 31 May 2012 15:17:54 +0000 (+0200) Subject: Remove usage of environment variable ARGS in tesh files. X-Git-Tag: v3_8~654^2~15 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f8bc6f6fba7b044bad78c0e3d8b4a37d908f0f41 Remove usage of environment variable ARGS in tesh files. It is nowadays never used, and such a generic name can be source of problems (it could be defined for other purposes). --- diff --git a/examples/amok/bandwidth/bandwidth_rl.tesh b/examples/amok/bandwidth/bandwidth_rl.tesh index 268c220694..34bb8252e0 100755 --- a/examples/amok/bandwidth/bandwidth_rl.tesh +++ b/examples/amok/bandwidth/bandwidth_rl.tesh @@ -1,13 +1,13 @@ ! timeout 20 -& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" > sensor:main Sensor starting (on port 3000) ! timeout 20 -& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" > sensor:main Sensor starting (on port 3001) ! timeout 20 -& $SG_TEST_ENV bandwidth/bandwidth_maestro$EXEEXT 6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV bandwidth/bandwidth_maestro$EXEEXT 6000 "--log=root.fmt=%P:%t%e%m%n" > maestro:main Maestro starting > maestro:main Wait for peers for 5 sec > maestro:main Contact 127.0.0.1:3000 diff --git a/examples/amok/saturate/saturate_rl.tesh b/examples/amok/saturate/saturate_rl.tesh index 7b590580f4..f9d57d28e5 100755 --- a/examples/amok/saturate/saturate_rl.tesh +++ b/examples/amok/saturate/saturate_rl.tesh @@ -1,14 +1,14 @@ ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" ! timeout 20 -& $SG_TEST_ENV saturate/saturate_maestro$EXEEXT 3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS +& $SG_TEST_ENV saturate/saturate_maestro$EXEEXT 3333 "--log=root.fmt=%P:%t%e%m%n" diff --git a/examples/gras/ping/test_rl.tesh b/examples/gras/ping/test_rl.tesh index 4908dd0cde..859ba97bd4 100755 --- a/examples/gras/ping/test_rl.tesh +++ b/examples/gras/ping/test_rl.tesh @@ -1,7 +1,7 @@ ! timeout 20 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_ENV ./ping_server$EXEEXT 4302 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV ./ping_server$EXEEXT 4302 --log=root.fmt=%P:%t%e%m%n > server:main Launch server (port=4302) > server:main Messages registered > server:main Messages registered @@ -16,7 +16,7 @@ $ $SG_TEST_ENV sleep 1 ! timeout 20 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_ENV ./ping_client$EXEEXT 127.0.0.1 4302 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV ./ping_client$EXEEXT 127.0.0.1 4302 --log=root.fmt=%P:%t%e%m%n > client:main Launch client (server on 127.0.0.1:4302) > client:main Connected to 127.0.0.1:4302. > client:main Messages registered diff --git a/examples/gras/ping/test_sg_32.tesh b/examples/gras/ping/test_sg_32.tesh index ef76fa99d7..ff401a357c 100644 --- a/examples/gras/ping/test_sg_32.tesh +++ b/examples/gras/ping/test_sg_32.tesh @@ -2,7 +2,7 @@ p Runs the 'ping' test within the simulator (simulation times valid for 32bits a ! output sort ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -$ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/ping.xml $ARGS "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:server@Tremblay) Launch server (port=4000) > [ 0.000000] (2:client@Fafard) Launch client (server on Tremblay:4000) > [ 0.000195] (1:server@Tremblay) Messages registered diff --git a/examples/gras/ping/test_sg_64.tesh b/examples/gras/ping/test_sg_64.tesh index c96003fd46..bbc4c68af2 100644 --- a/examples/gras/ping/test_sg_64.tesh +++ b/examples/gras/ping/test_sg_64.tesh @@ -18,4 +18,4 @@ $ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platfo > [ 0.051613] (1:server@Tremblay) Exiting GRAS > [ 0.051613] (2:client@Fafard) >>>>>>>> Got PONG(4321) from Tremblay:4000 <<<<<<<< > [ 0.051613] (2:client@Fafard) Done. -> [ 0.051613] (2:client@Fafard) Exiting GRAS \ No newline at end of file +> [ 0.051613] (2:client@Fafard) Exiting GRAS diff --git a/examples/gras/properties/test_rl.tesh b/examples/gras/properties/test_rl.tesh index 2376a931c6..831274f07f 100755 --- a/examples/gras/properties/test_rl.tesh +++ b/examples/gras/properties/test_rl.tesh @@ -1,7 +1,7 @@ ! setenv SG_TEST_blah=blah ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -$ $SG_TEST_ENV ./properties_alice --log=root.fmt=%P:%t%e%m%n $ARGS +$ $SG_TEST_ENV ./properties_alice --log=root.fmt=%P:%t%e%m%n > alice:main == Dump all the properties of current host > alice:main == Dump all the properties of alice > alice:main Process property: 'SG_TEST_blah' has value: 'blah' @@ -11,7 +11,7 @@ $ $SG_TEST_ENV ./properties_alice --log=root.fmt=%P:%t%e%m%n $ARGS ! setenv SG_TEST_blah=blah ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -$ $SG_TEST_ENV ./properties_bob --log=root.fmt=%P:%t%e%m%n $ARGS +$ $SG_TEST_ENV ./properties_bob --log=root.fmt=%P:%t%e%m%n > bob:main == Dump all the properties of host1 > bob:main == Try to get a property that does not exist > bob:main == Set a host property that alice will try to retrieve in SG (from bob->hello) diff --git a/teshsuite/gras/datadesc/datadesc_r_little64.tesh b/teshsuite/gras/datadesc/datadesc_r_little64.tesh index 1c6e955163..e2fd6e6347 100644 --- a/teshsuite/gras/datadesc/datadesc_r_little64.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_little64.tesh @@ -1,7 +1,7 @@ p Check the marshaling facilities (trying to read the result of linux/amd64) ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -$ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64 --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n" $ARGS +$ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64 --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n" > Read from file datadesc.little64 > This file was generated on little64 (4) > ---- Test on integer ---- diff --git a/teshsuite/gras/empty_main/test_rl.tesh b/teshsuite/gras/empty_main/test_rl.tesh index 8b9e840795..b94f15ca44 100755 --- a/teshsuite/gras/empty_main/test_rl.tesh +++ b/teshsuite/gras/empty_main/test_rl.tesh @@ -1,5 +1,5 @@ ! timeout 20 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_ENV ${bindir:=.}/empty_main_function$EXEEXT --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV ${bindir:=.}/empty_main_function$EXEEXT --log=root.fmt=%P:%t%e%m%n > function:main Exiting GRAS diff --git a/teshsuite/gras/msg_handle/test_rl.tesh b/teshsuite/gras/msg_handle/test_rl.tesh index f20ece92ef..c0b34f4d9e 100755 --- a/teshsuite/gras/msg_handle/test_rl.tesh +++ b/teshsuite/gras/msg_handle/test_rl.tesh @@ -1,7 +1,7 @@ ! timeout 20 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_ENV gras/msg_handle/msg_handle_server$EXEEXT 4002 127.0.0.1:4003 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV gras/msg_handle/msg_handle_server$EXEEXT 4002 127.0.0.1:4003 --log=root.fmt=%P:%t%e%m%n > server:main Launch server (port=4002) > server:main Initialization done. > server:main gras_msg_handle(0) works as expected (immediate timeout) @@ -11,7 +11,7 @@ ! timeout 20 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_ENV gras/msg_handle/msg_handle_client$EXEEXT 4003 127.0.0.1:4002 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV gras/msg_handle/msg_handle_client$EXEEXT 4003 127.0.0.1:4002 --log=root.fmt=%P:%t%e%m%n > client:main Launch client (port=4003) > client:main Initialization done. > client:main Got the message