From fe2cfede6b5e1c8d2af6db841de278dfcffd8baf Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 26 Jun 2012 16:26:22 +0200 Subject: [PATCH 1/1] Remove unnecessary spaces and empty lines in tesh files. --- examples/amok/saturate/saturate_sg_32.tesh | 1 - examples/gras/all2all/test_rl.tesh | 1 - examples/gras/chrono/test_rl.tesh | 2 +- examples/gras/mmrpc/test_rl.tesh | 4 +- .../simple_token/test_rl.tesh | 12 +-- examples/gras/properties/test_rl.tesh | 1 - .../msg/actions/NAS_LU_S_4/instr_actions.tesh | 1 - examples/msg/actions/actions.tesh | 1 - .../cloud/masterslave_virtual_machines.tesh | 1 - .../msg/gtnets/gtnets-onelink-gtnets.tesh | 1 - .../gtnets/tracing-gtnets-dogbone-gtnets.tesh | 1 - .../gtnets/tracing-gtnets-onelink-gtnets.tesh | 1 - examples/msg/icomms/peer.tesh | 4 +- .../msg/masterslave/masterslave_cas01_im.tesh | 1 - .../masterslave/masterslave_crosstraffic.tesh | 1 - .../masterslave/masterslave_forwarder.tesh | 1 - .../msg/masterslave/masterslave_vivaldi.tesh | 1 - examples/msg/ns3/ns3.tesh | 2 - examples/msg/sendrecv/sendrecv_KCCFLN05.tesh | 1 - examples/msg/sendrecv/sendrecv_Reno.tesh | 1 - examples/msg/token_ring/token_ring.tesh | 1 - examples/msg/tracing/ms.tesh | 2 +- .../simdag/dax/simple_dax_with_cycle.tesh | 2 +- examples/simdag/dot/test_simdag_dotload.tesh | 4 +- examples/simdag/properties/test_prop.tesh | 3 - examples/simdag/test_simdag_seq_access.tesh | 55 ----------- examples/smpi/bcast.tesh | 3 - examples/smpi/reduce.tesh | 7 +- examples/smpi/tracing/smpi_traced.tesh | 2 +- teshsuite/SimGrid.tesh | 93 +++++++++---------- teshsuite/gras/datadesc/datadesc.tesh | 30 +++--- teshsuite/gras/gras.tesh | 17 ++-- teshsuite/gras/small_sleep/test_sg_32.tesh | 1 - teshsuite/msg/trace/trace.tesh | 5 +- teshsuite/simdag/basic6.tesh | 1 - .../network/mxn/test_intra_scatter.tesh | 1 - .../simdag/network/p2p/test_latency1.tesh | 3 +- .../simdag/network/p2p/test_latency2.tesh | 3 +- .../simdag/network/p2p/test_latency3.tesh | 3 +- teshsuite/simdag/platforms/get_full_link.tesh | 2 - teshsuite/simdag/simdag.tesh | 32 +++---- teshsuite/xbt/log_large_test.tesh | 2 +- teshsuite/xbt/parallel_log_crashtest.tesh | 2 +- teshsuite/xbt/xbt.tesh | 12 +-- tools/graphicator/graphicator.tesh | 1 - tools/tesh/IO-bigsize.tesh | 2 +- tools/tesh/IO-broken-pipe.tesh | 1 - tools/tesh/IO-orders.tesh | 1 - tools/tesh/background.tesh | 3 +- tools/tesh/catch-wrong-output.tesh | 1 - tools/tesh/cd.tesh | 2 +- 51 files changed, 114 insertions(+), 222 deletions(-) diff --git a/examples/amok/saturate/saturate_sg_32.tesh b/examples/amok/saturate/saturate_sg_32.tesh index 00b154ca95..df0b549d26 100644 --- a/examples/amok/saturate/saturate_sg_32.tesh +++ b/examples/amok/saturate/saturate_sg_32.tesh @@ -15,4 +15,3 @@ $ $SG_TEST_EXENV saturate/saturate_simulator${EXEEXT} ${srcdir:=.}/../msg/small_ > [Bourassa:maestro:(5) 13.242860] [gras/INFO] Exiting GRAS > [Ginette:sensor:(4) 73.188984] [amok_bw_sat/INFO] Saturation comming from Tremblay:3000 stopped on Ginette:3000 > [Ginette:sensor:(4) 73.188984] [gras/INFO] Exiting GRAS - diff --git a/examples/gras/all2all/test_rl.tesh b/examples/gras/all2all/test_rl.tesh index 6bcd0f6ba0..c7ffc4137e 100755 --- a/examples/gras/all2all/test_rl.tesh +++ b/examples/gras/all2all/test_rl.tesh @@ -107,4 +107,3 @@ $ $SG_TEST_EXENV ./all2all_sender$EXEEXT 127.0.0.1:4400 127.0.0.1:4401 127.0.0.1 > Sent Data > Sent Data > Exiting GRAS - diff --git a/examples/gras/chrono/test_rl.tesh b/examples/gras/chrono/test_rl.tesh index cc7b75eace..16aa7b0080 100755 --- a/examples/gras/chrono/test_rl.tesh +++ b/examples/gras/chrono/test_rl.tesh @@ -1,3 +1,3 @@ ! output display -$ $SG_TEST_EXENV ./chrono_multiplier$EXEEXT --log=root.fmt:%m%n $@ +$ $SG_TEST_EXENV ./chrono_multiplier$EXEEXT --log=root.fmt:%m%n $@ diff --git a/examples/gras/mmrpc/test_rl.tesh b/examples/gras/mmrpc/test_rl.tesh index aedab248c3..35534b2f55 100755 --- a/examples/gras/mmrpc/test_rl.tesh +++ b/examples/gras/mmrpc/test_rl.tesh @@ -1,10 +1,10 @@ ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./mmrpc_server$EXEEXT 4502 --log=root.fmt:%m%n +& $SG_TEST_EXENV ./mmrpc_server$EXEEXT 4502 --log=root.fmt:%m%n > Launch server (port=4502) > Exiting GRAS ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -$ $SG_TEST_EXENV ./mmrpc_client$EXEEXT 127.0.0.1 4502 --log=root.fmt:%m%n +$ $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 <<<<<<<< diff --git a/examples/gras/mutual_exclusion/simple_token/test_rl.tesh b/examples/gras/mutual_exclusion/simple_token/test_rl.tesh index 38f17b5aef..69115130ce 100755 --- a/examples/gras/mutual_exclusion/simple_token/test_rl.tesh +++ b/examples/gras/mutual_exclusion/simple_token/test_rl.tesh @@ -1,5 +1,5 @@ ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4100 127.0.0.1 4110 --create-token --log=root.fmt:%m%n $@ +& $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 @@ -9,26 +9,26 @@ > Exiting GRAS ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4110 127.0.0.1 4120 --log=root.fmt:%m%n $@ +& $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 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4120 127.0.0.1 4130 --log=root.fmt:%m%n $@ +& $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 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4130 127.0.0.1 4141 --log=root.fmt:%m%n $@ +& $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 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4141 127.0.0.1 4150 --log=root.fmt:%m%n $@ +& $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 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -& $SG_TEST_EXENV ./simple_token_node$EXEEXT 4150 127.0.0.1 4100 --log=root.fmt:%m%n $@ +& $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/properties/test_rl.tesh b/examples/gras/properties/test_rl.tesh index 831274f07f..8f0a9a0975 100755 --- a/examples/gras/properties/test_rl.tesh +++ b/examples/gras/properties/test_rl.tesh @@ -18,4 +18,3 @@ $ $SG_TEST_ENV ./properties_bob --log=root.fmt=%P:%t%e%m%n > bob:main == Dump all the properties of host1 again to check the addition > bob:main Host property: 'from bob' has value: 'hello' > bob:main Exiting GRAS - diff --git a/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh b/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh index de35994f4a..6a2398374e 100644 --- a/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh +++ b/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh @@ -1,6 +1,5 @@ # A little tesh file testing most MPI-related actions - $ ../actions --cfg=tracing:1 --cfg=tracing/smpi:1 --log=surf_config.thresh:critical --cfg=network/model:SMPI platform.xml deploy_MPI_4.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh index cbd8ee499f..4361c9c52f 100644 --- a/examples/msg/actions/actions.tesh +++ b/examples/msg/actions/actions.tesh @@ -1,6 +1,5 @@ # A little tesh file testing most MPI-related actions - ! output sort $ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [500.006505] (1:p0@host0) p0 recv p1 500.006505 diff --git a/examples/msg/cloud/masterslave_virtual_machines.tesh b/examples/msg/cloud/masterslave_virtual_machines.tesh index e3e62a5373..f63e78db99 100644 --- a/examples/msg/cloud/masterslave_virtual_machines.tesh +++ b/examples/msg/cloud/masterslave_virtual_machines.tesh @@ -116,4 +116,3 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud/masterslave_virtual_machines$EXEEXT ${srcdir > [ 2835.981646] (0:@) Simulation time 2835.98 > [ 2835.981646] (11:Slave 9@Provost) Received "finalize" from mailbox Slave_9 > [ 2835.981646] (1:master@Jacquelin) Goodbye now! - diff --git a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh index be20fee119..edeefec740 100644 --- a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh +++ b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh @@ -8,4 +8,3 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' > [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 > [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ; message from S1 to C1 with remaining : 0.000000 - diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh index d10b878566..dfededf100 100644 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh +++ b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh @@ -11,4 +11,3 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d. > [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ; message from S1 to C1 with remaining : 0.000000 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ; message from S2 to C2 with remaining : 0.000000 - diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh index 0f2cc2adc2..c571469a17 100644 --- a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh +++ b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh @@ -10,4 +10,3 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' > [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 > [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ; message from S1 to C1 with remaining : 0.000000 - diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh index 02d08d4449..e2e9e5cfe7 100644 --- a/examples/msg/icomms/peer.tesh +++ b/examples/msg/icomms/peer.tesh @@ -1,7 +1,5 @@ #! ./tesh - - p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver ! output sort @@ -114,7 +112,7 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer04.xml "--l > [ 6.581936] (2:receiver@Ruby) Received "finalize" > [ 6.581936] (2:receiver@Ruby) I'm done. See you! -p Test1 MSG_comm_waitall() for sender +p Test1 MSG_comm_waitall() for sender ! output sort $ ./peer2 ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" diff --git a/examples/msg/masterslave/masterslave_cas01_im.tesh b/examples/msg/masterslave/masterslave_cas01_im.tesh index 918d6bdd95..f0ba74fe92 100644 --- a/examples/msg/masterslave/masterslave_cas01_im.tesh +++ b/examples/msg/masterslave/masterslave_cas01_im.tesh @@ -503,4 +503,3 @@ $ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu_model:Cas > [host B:slave:(2) 84.680000] [msg_test/INFO] Received "finalize" > [host B:slave:(2) 84.680000] [msg_test/INFO] I'm done. See you! > [84.680000] [msg_test/INFO] Simulation time 84.68 - diff --git a/examples/msg/masterslave/masterslave_crosstraffic.tesh b/examples/msg/masterslave/masterslave_crosstraffic.tesh index b49b42810e..2e786c5cc9 100644 --- a/examples/msg/masterslave/masterslave_crosstraffic.tesh +++ b/examples/msg/masterslave/masterslave_crosstraffic.tesh @@ -121,4 +121,3 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_pla > [ 5.570175] (2:slave@Tremblay) I'm done. See you! > [ 5.570175] (1:master@Tremblay) Goodbye now! > [ 5.570175] (0:@) Simulation time 5.57017 - diff --git a/examples/msg/masterslave/masterslave_forwarder.tesh b/examples/msg/masterslave/masterslave_forwarder.tesh index 77e5039b34..09dbfbdc71 100644 --- a/examples/msg/masterslave/masterslave_forwarder.tesh +++ b/examples/msg/masterslave/masterslave_forwarder.tesh @@ -149,4 +149,3 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platf > [ 66.771606] (2:forwarder@Jackson) I'm done. See you! > [ 66.771606] (9:slave@Stephen) Received "finalize" > [ 66.771606] (9:slave@Stephen) I'm done. See you! - diff --git a/examples/msg/masterslave/masterslave_vivaldi.tesh b/examples/msg/masterslave/masterslave_vivaldi.tesh index c1a16d2a8e..afd3d19be8 100644 --- a/examples/msg/masterslave/masterslave_vivaldi.tesh +++ b/examples/msg/masterslave/masterslave_vivaldi.tesh @@ -68,4 +68,3 @@ $ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ${srcdir:=.}/../platforms/vi > [100427449:slave:(39) 3.850431] [msg_test/INFO] I'm done. See you! > [100429957:slave:(40) 3.879075] [msg_test/INFO] I'm done. See you! > [3.879075] [msg_test/INFO] Simulation time 3.87907 - diff --git a/examples/msg/ns3/ns3.tesh b/examples/msg/ns3/ns3.tesh index d1e4bc55d5..cb26e470c4 100644 --- a/examples/msg/ns3/ns3.tesh +++ b/examples/msg/ns3/ns3.tesh @@ -16,7 +16,6 @@ $ ns3/ns3 ${srcdir:=.}/examples/msg/ns3/3links-p.xml ${srcdir:=.}/examples/msg/n > [C2:slave:(4) 1.041346] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from S2 to C2 > [C3:slave:(6) 2.082380] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from S3 to C3 - $ ns3/ns3 ${srcdir:=.}/examples/msg/ns3/3links-p.xml ${srcdir:=.}/examples/msg/ns3/3links-d-timer.xml --cfg=network/model:NS3 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) @@ -25,7 +24,6 @@ $ ns3/ns3 ${srcdir:=.}/examples/msg/ns3/3links-p.xml ${srcdir:=.}/examples/msg/n > [C3:slave:(6) 2.082422] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from S3 to C3 > [C3:slave:(7) 4.164594] [msg_test/INFO] FLOW[4] : Receive 2000000 bytes from S3 to C3 - p One cluster $ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/One_cluster-d.xml --cfg=network/model:NS3 diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh index e58029bd9f..2355d9cfa8 100644 --- a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh +++ b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh @@ -16,4 +16,3 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrec > [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Communic. time 1.000010e+04 > [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] --- bw 99999.000010 ---- > [10000.200100] [msg_test/INFO] Total simulation time: 1.000020e+04 - diff --git a/examples/msg/sendrecv/sendrecv_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh index 6d587ab0b2..e4eb2bb972 100644 --- a/examples/msg/sendrecv/sendrecv_Reno.tesh +++ b/examples/msg/sendrecv/sendrecv_Reno.tesh @@ -2,7 +2,6 @@ p Testing the surf network Reno fairness model using lagrangian approach - ! output sort $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh index 4708139779..6b9d935bf7 100644 --- a/examples/msg/token_ring/token_ring.tesh +++ b/examples/msg/token_ring/token_ring.tesh @@ -24,7 +24,6 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_clusters.xml "--log=ro > [ 1.130100] (1:0@bob1.hamburger.edu) Host "0" received "Token" > [ 1.130100] (0:@) Simulation time 1.1301 - $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'network/coordinates' to 'yes' > [ 0.000000] (0:@) Number of host '2' diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh index 151fbb11a8..482883fcce 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -20,7 +20,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/bu p Not tracing master/slave application $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml -p Testing tracing by process +p Testing tracing by process $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/process:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' diff --git a/examples/simdag/dax/simple_dax_with_cycle.tesh b/examples/simdag/dax/simple_dax_with_cycle.tesh index 151fc96c5c..7b0e42aea8 100644 --- a/examples/simdag/dax/simple_dax_with_cycle.tesh +++ b/examples/simdag/dax/simple_dax_with_cycle.tesh @@ -2,7 +2,7 @@ p Test the DAX loader with a DAX comprising a cycle. ! expect signal SIGABRT -$ $SG_TEST_EXENV ./dax_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/simple_dax_with_cycle.xml +$ $SG_TEST_EXENV ./dax_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/simple_dax_with_cycle.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle diff --git a/examples/simdag/dot/test_simdag_dotload.tesh b/examples/simdag/dot/test_simdag_dotload.tesh index 5a6aae00cc..3380667c11 100644 --- a/examples/simdag/dot/test_simdag_dotload.tesh +++ b/examples/simdag/dot/test_simdag_dotload.tesh @@ -222,7 +222,7 @@ $ cat ${srcdir:=.}/dag.trace $ rm -f dag.trace ! expect signal SIGABRT -$ $SG_TEST_EXENV ./simulate_dot --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_bad_schedule.dot +$ $SG_TEST_EXENV ./simulate_dot --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_bad_schedule.dot > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, there are not enough computers > [0.000000] [sd_dotparse/WARNING] is not an integer @@ -236,7 +236,7 @@ $ $SG_TEST_EXENV ./simulate_dot --log=no_loc "--log=sd_dotparse.thres:verbose" > [0.000000] [sd_dotparse/WARNING] The scheduling is ignored > [0.000000] [xbt/CRITICAL] The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose -$ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_good_schedule.dot +$ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_good_schedule.dot > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root diff --git a/examples/simdag/properties/test_prop.tesh b/examples/simdag/properties/test_prop.tesh index abdb83a4dd..f08e9b98de 100755 --- a/examples/simdag/properties/test_prop.tesh +++ b/examples/simdag/properties/test_prop.tesh @@ -21,6 +21,3 @@ $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml > [0.000000] [sd_workstation/INFO] no task running > [0.000000] [sd_workstation/INFO] - properties: > [0.000000] [sd_workstation/INFO] SG_TEST_Hdd->250 - - - diff --git a/examples/simdag/test_simdag_seq_access.tesh b/examples/simdag/test_simdag_seq_access.tesh index e8ee2f0edb..eac2bdce14 100644 --- a/examples/simdag/test_simdag_seq_access.tesh +++ b/examples/simdag/test_simdag_seq_access.tesh @@ -65,58 +65,3 @@ $ $SG_TEST_EXENV ./sd_seq_access ${srcdir:=.}/2clusters.xml > [22.000000] [sd_workstation/INFO] - power: 5000000000 > [22.000000] [sd_workstation/INFO] - available power: 1.00 > [22.000000] [sd_workstation/INFO] - access mode: Space shared - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh index 278d8dc7e4..5a40103740 100644 --- a/examples/smpi/bcast.tesh +++ b/examples/smpi/bcast.tesh @@ -11,8 +11,6 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) - - # second test p Test Broadcast with as much processes than hosts ! setenv LD_LIBRARY_PATH=../../lib @@ -27,7 +25,6 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) - # Another test p Test Broadcast with more processes than hosts ! setenv LD_LIBRARY_PATH=../../lib diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh index 8725a0e98c..4c7f93f7e0 100644 --- a/examples/smpi/reduce.tesh +++ b/examples/smpi/reduce.tesh @@ -1,7 +1,7 @@ # use the tested library, not the installed one # (since we want to pass it to the child, it has to be redefined before each command) # Go for the first test -p Test Reduce with 3 processes +p Test Reduce with 3 processes $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./reduce -q > [rank 0] -> Tremblay > [rank 1] -> Jupiter @@ -43,11 +43,10 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > ok. > ok. - # third test ! setenv LD_LIBRARY_PATH=../../lib -p Test Reduce with 12 processes -$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./reduce -q +p Test Reduce with 12 processes +$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./reduce -q > You requested to use 12 processes, but there is only 5 processes in your hostfile... > [rank 0] -> Tremblay > [rank 1] -> Jupiter diff --git a/examples/smpi/tracing/smpi_traced.tesh b/examples/smpi/tracing/smpi_traced.tesh index f589f01caa..5a22819cf7 100644 --- a/examples/smpi/tracing/smpi_traced.tesh +++ b/examples/smpi/tracing/smpi_traced.tesh @@ -2,7 +2,7 @@ # (since we want to pass it to the child, it has to be redefined before each command) # Go for the first test p Test instrumentation of SMPI -$ ../../bin/smpirun -trace -trace-resource -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced +$ ../../bin/smpirun -trace -trace-resource -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' diff --git a/teshsuite/SimGrid.tesh b/teshsuite/SimGrid.tesh index b4a4642a9b..7260650581 100644 --- a/teshsuite/SimGrid.tesh +++ b/teshsuite/SimGrid.tesh @@ -1,51 +1,42 @@ -D Tesh tests of SimGrid library. -p Command line tesh --directory=%teshsuite_dir% --include-dir=simdag --include-dir=xbt --file=SimGrid.tesh --log="log.thresh:info tesh.fmt:%m%n" - - -$ cd ${TESHSUITE_DIR:=.} - -# XBT - -! include log_large_test.tesh - -# SimDag Tests - -# Basic Tests -! include basic0.tesh -! include basic1.tesh -! include basic2.tesh -! include basic3.tesh -! include basic4.tesh -! include basic5.tesh -! include basic6.tesh -! include incomplete.tesh - - -# Network Tests -! include network/test_reinit_costs.tesh - -# MXN Tests -! include network/mxn/test_intra_scatter.tesh -! include network/mxn/test_intra_independent_comm.tesh -! include network/mxn/test_intra_all2all.tesh - -# P2P Tests -! include network/p2p/test_latency1.tesh -! include network/p2p/test_latency2.tesh -! include network/p2p/test_latency3.tesh -! include network/p2p/test_latency_bound.tesh - -# Parallel task -! include partask/test_comp_only_par.tesh -! include partask/test_comp_only_seq.tesh - -# Platforms -! include platforms/basic_parsing_test.tesh -! include platforms/flatifier.tesh - - - - - - - +D Tesh tests of SimGrid library. +p Command line tesh --directory=%teshsuite_dir% --include-dir=simdag --include-dir=xbt --file=SimGrid.tesh --log="log.thresh:info tesh.fmt:%m%n" + +$ cd ${TESHSUITE_DIR:=.} + +# XBT + +! include log_large_test.tesh + +# SimDag Tests + +# Basic Tests +! include basic0.tesh +! include basic1.tesh +! include basic2.tesh +! include basic3.tesh +! include basic4.tesh +! include basic5.tesh +! include basic6.tesh +! include incomplete.tesh + +# Network Tests +! include network/test_reinit_costs.tesh + +# MXN Tests +! include network/mxn/test_intra_scatter.tesh +! include network/mxn/test_intra_independent_comm.tesh +! include network/mxn/test_intra_all2all.tesh + +# P2P Tests +! include network/p2p/test_latency1.tesh +! include network/p2p/test_latency2.tesh +! include network/p2p/test_latency3.tesh +! include network/p2p/test_latency_bound.tesh + +# Parallel task +! include partask/test_comp_only_par.tesh +! include partask/test_comp_only_seq.tesh + +# Platforms +! include platforms/basic_parsing_test.tesh +! include platforms/flatifier.tesh diff --git a/teshsuite/gras/datadesc/datadesc.tesh b/teshsuite/gras/datadesc/datadesc.tesh index 65777fef78..84d45b86db 100644 --- a/teshsuite/gras/datadesc/datadesc.tesh +++ b/teshsuite/gras/datadesc/datadesc.tesh @@ -1,15 +1,15 @@ -#! ./tesh - -# Description of this tesh file -! D This tesh file contains all the tesh files relative with Gras - -# Gras datadesc suite - -! suite Checks the marshaling facilities of Gras -! include datadesc_mem.tesh Try to do a in-memory copy -! include datadesc_rw.tesh Try to read what we write -! include datadesc_r_big32_2.tesh Try to read the result of linux/mips? -! include datadesc_r_big32_8.tesh Try to read the result of ppc/sparc? -! include datadesc_r_big32_8_4.tesh Try to read the result of AIX -! include datadesc_r_little32_4.tesh Try to read the result of linux/x86 -! include datadesc_r_little64.tesh Try to read the result of linux/amd64 \ No newline at end of file +#! ./tesh + +# Description of this tesh file +! D This tesh file contains all the tesh files relative with Gras + +# Gras datadesc suite + +! suite Checks the marshaling facilities of Gras +! include datadesc_mem.tesh Try to do a in-memory copy +! include datadesc_rw.tesh Try to read what we write +! include datadesc_r_big32_2.tesh Try to read the result of linux/mips? +! include datadesc_r_big32_8.tesh Try to read the result of ppc/sparc? +! include datadesc_r_big32_8_4.tesh Try to read the result of AIX +! include datadesc_r_little32_4.tesh Try to read the result of linux/x86 +! include datadesc_r_little64.tesh Try to read the result of linux/amd64 diff --git a/teshsuite/gras/gras.tesh b/teshsuite/gras/gras.tesh index 7c6b8902b4..89a1f5f7cd 100644 --- a/teshsuite/gras/gras.tesh +++ b/teshsuite/gras/gras.tesh @@ -1,10 +1,7 @@ -#! ./tesh - -# Description of this tesh file -! D This tesh file contains all the tesh files relative with Gras - -# includes the Gras marshaling facilities tesh suite -! include datadesc.tesh - - - +#! ./tesh + +# Description of this tesh file +! D This tesh file contains all the tesh files relative with Gras + +# includes the Gras marshaling facilities tesh suite +! include datadesc.tesh diff --git a/teshsuite/gras/small_sleep/test_sg_32.tesh b/teshsuite/gras/small_sleep/test_sg_32.tesh index 723b32dce7..f56d806b24 100755 --- a/teshsuite/gras/small_sleep/test_sg_32.tesh +++ b/teshsuite/gras/small_sleep/test_sg_32.tesh @@ -8,4 +8,3 @@ $ $SG_TEST_EXENV ${bindir:=.}/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../e > [Tremblay:function:(1) 100.000030] [test/INFO] Let's go 1E-20 > [Tremblay:function:(1) 100.000030] [test/INFO] done > [Tremblay:function:(1) 100.000030] [gras/INFO] Exiting GRAS - diff --git a/teshsuite/msg/trace/trace.tesh b/teshsuite/msg/trace/trace.tesh index a1ea5cccb3..7f82d0c6f3 100644 --- a/teshsuite/msg/trace/trace.tesh +++ b/teshsuite/msg/trace/trace.tesh @@ -13,7 +13,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1. > [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 > [ 40.000000] (1:test_trace@CPU1) Test finished -p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) +p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) ! output sort $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -26,8 +26,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2. > [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 > [ 85.000000] (1:test_trace@CPU1) Test finished - -p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) +p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) ! output sort $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh index a90cca698e..5435cb2ea1 100644 --- a/teshsuite/simdag/basic6.tesh +++ b/teshsuite/simdag/basic6.tesh @@ -1,4 +1,3 @@ $ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 2.000000] (0:@) Simulation time: 2.000000 - diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh index 3e74e9ae9a..5a1391e7e8 100644 --- a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh @@ -4,4 +4,3 @@ p scatter test $ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 8 - diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh index 6ac5aff350..f6f7588f39 100644 --- a/teshsuite/simdag/network/p2p/test_latency1.tesh +++ b/teshsuite/simdag/network/p2p/test_latency1.tesh @@ -11,9 +11,8 @@ $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 -p latency check, 1 byte, link - switch - link +p latency check, 1 byte, link - switch - link $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 3 - diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh index 42fbdb19ed..5913cf13ba 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.tesh +++ b/teshsuite/simdag/network/p2p/test_latency2.tesh @@ -11,9 +11,8 @@ $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 -p latency check, 2 x 1 byte, same direction, link - switch - link +p latency check, 2 x 1 byte, same direction, link - switch - link $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 4 - diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh index c27dcd390e..d3a89139a7 100644 --- a/teshsuite/simdag/network/p2p/test_latency3.tesh +++ b/teshsuite/simdag/network/p2p/test_latency3.tesh @@ -11,9 +11,8 @@ $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 -p latency check, 2 x 1 byte, opposite direction, link - switch - link +p latency check, 2 x 1 byte, opposite direction, link - switch - link $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 4 - diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh index 440c6fffa8..a8456f1142 100644 --- a/teshsuite/simdag/platforms/get_full_link.tesh +++ b/teshsuite/simdag/platforms/get_full_link.tesh @@ -72,8 +72,6 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK > Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 > Route latency = 0.000015, route bandwidth = 498000000.000000 - - $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > Workstation number: 5, link number: 7 diff --git a/teshsuite/simdag/simdag.tesh b/teshsuite/simdag/simdag.tesh index 1d6fea1bbd..5d99382372 100644 --- a/teshsuite/simdag/simdag.tesh +++ b/teshsuite/simdag/simdag.tesh @@ -1,16 +1,16 @@ -#! ./tesh - -# Description of this tesh file -D This tesh file contains all the tesh files relative with SimDag - -# SimDag tesh suite - -! suite Simdag tests this suite contains all the tesh files relative with SimDag -! include basic0.tesh -! include basic1.tesh -! include basic2.tesh -! include basic3.tesh -! include basic4.tesh -! include basic5.tesh -! include basic6.tesh -! include incomplete.tesh +#! ./tesh + +# Description of this tesh file +D This tesh file contains all the tesh files relative with SimDag + +# SimDag tesh suite + +! suite Simdag tests this suite contains all the tesh files relative with SimDag +! include basic0.tesh +! include basic1.tesh +! include basic2.tesh +! include basic3.tesh +! include basic4.tesh +! include basic5.tesh +! include basic6.tesh +! include incomplete.tesh diff --git a/teshsuite/xbt/log_large_test.tesh b/teshsuite/xbt/log_large_test.tesh index ef133625be..2c749d5caf 100644 --- a/teshsuite/xbt/log_large_test.tesh +++ b/teshsuite/xbt/log_large_test.tesh @@ -116,7 +116,7 @@ $ $SG_EXENV_TEST xbt/log_large_test "--log=root.fmt:%m%n" > Done (strlen>10210) p Check that the dynamic version of the log formated layout works -$ $SG_EXENV_TEST xbt/log_large_test "--log=root.fmt:%m%n" +$ $SG_EXENV_TEST xbt/log_large_test "--log=root.fmt:%m%n" > This is a very large message: > 0 > 1.........1.........2.........3.........4.........5.........6.........7.........8.........9.........0 diff --git a/teshsuite/xbt/parallel_log_crashtest.tesh b/teshsuite/xbt/parallel_log_crashtest.tesh index 5e0f919f4d..0f18b71d59 100644 --- a/teshsuite/xbt/parallel_log_crashtest.tesh +++ b/teshsuite/xbt/parallel_log_crashtest.tesh @@ -2,7 +2,7 @@ ! timeout 20 p Try to crash the log mecanism by using it in parallel with a lot of threads ! setenv GRAS_NO_WARN_EXPERIMENTAL=1 -$ xbt/parallel_log_crashtest "--log=root.fmt:%m%n" +$ xbt/parallel_log_crashtest "--log=root.fmt:%m%n" > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) diff --git a/teshsuite/xbt/xbt.tesh b/teshsuite/xbt/xbt.tesh index 3f505405cd..23c95332f9 100644 --- a/teshsuite/xbt/xbt.tesh +++ b/teshsuite/xbt/xbt.tesh @@ -1,6 +1,6 @@ -#! ./tesh - -# Description of this tesh file -! D This tesh file contains all the tesh files relative with the xbt framework - -! include parallel_log_crashtest.tesh \ No newline at end of file +#! ./tesh + +# Description of this tesh file +! D This tesh file contains all the tesh files relative with the xbt framework + +! include parallel_log_crashtest.tesh diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh index bd43763d93..58d754c8f3 100644 --- a/tools/graphicator/graphicator.tesh +++ b/tools/graphicator/graphicator.tesh @@ -4,5 +4,4 @@ $ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/simdag/platforms/one_cluster.x > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' - $ rm test.dot diff --git a/tools/tesh/IO-bigsize.tesh b/tools/tesh/IO-bigsize.tesh index 1cbc1e836c..5f4e02b656 100644 --- a/tools/tesh/IO-bigsize.tesh +++ b/tools/tesh/IO-bigsize.tesh @@ -3,7 +3,7 @@ # The first one uses a very big input (150k) to check whether trucated input do work. # The second one uses both a big input and a big output (150k each). # -# This checks whether the non-blocking I/O mess is functionnal. +# This checks whether the non-blocking I/O mess is functionnal. # p First, a write test diff --git a/tools/tesh/IO-broken-pipe.tesh b/tools/tesh/IO-broken-pipe.tesh index 2537ce8d4b..c1be2229d9 100644 --- a/tools/tesh/IO-broken-pipe.tesh +++ b/tools/tesh/IO-broken-pipe.tesh @@ -60,4 +60,3 @@ $ echo < blablablablablablablablablablablablablablablablablablablabla > $ echo - diff --git a/tools/tesh/IO-orders.tesh b/tools/tesh/IO-orders.tesh index 79483162fe..28be9c2e4a 100644 --- a/tools/tesh/IO-orders.tesh +++ b/tools/tesh/IO-orders.tesh @@ -60,4 +60,3 @@ p Order: cmd, in, out > [(stdin):1] cat > Test suite from stdin OK $ ./tesh --enable-coverage --log='log.thresh:info tesh.fmt:%m%n' - diff --git a/tools/tesh/background.tesh b/tools/tesh/background.tesh index e03da443d7..7c9de93192 100644 --- a/tools/tesh/background.tesh +++ b/tools/tesh/background.tesh @@ -38,7 +38,7 @@ $ mkfile delayed_cat.c $ gcc -Wall -o delayed_cat delayed_cat.c -& ./delayed_cat +& ./delayed_cat > TOTO < TOTO @@ -47,4 +47,3 @@ $ mkfile tmp_fich $ sleep 2 $ cd .. $ rm -rf temp_testdir_background - diff --git a/tools/tesh/catch-wrong-output.tesh b/tools/tesh/catch-wrong-output.tesh index bfb2adbf98..e60d7608e3 100644 --- a/tools/tesh/catch-wrong-output.tesh +++ b/tools/tesh/catch-wrong-output.tesh @@ -14,4 +14,3 @@ $ ./tesh --enable-coverage --log='log.thresh:info tesh.fmt:%m%n' > - TOTO > + TUTU > Test suite `(stdin)': NOK (<(stdin):3> output mismatch) - diff --git a/tools/tesh/cd.tesh b/tools/tesh/cd.tesh index 807086412a..dc297db6a1 100644 --- a/tools/tesh/cd.tesh +++ b/tools/tesh/cd.tesh @@ -18,7 +18,7 @@ $ ls > Test suite `(stdin)': NOK (system error) $ ../tesh --enable-coverage --log='log.thresh:info tesh.fmt:%m%n' -# The next command checks that there is a testdir_temp-cd in the upper directory, +# The next command checks that there is a testdir_temp-cd in the upper directory, # ie that mkdir and cd both worked. $ test -e ../testdir_temp-cd -- 2.20.1