From 17832e54878101e1817752c3d175cd9a31c9485b Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 9 May 2019 09:18:35 +0200 Subject: [PATCH] Tesh files: kill obsolete variables SG_TEST_EXENV and EXEEXT. --- .../app-masterworker-multicore.tesh | 2 +- .../app-masterworker-vivaldi.tesh | 2 +- .../app-masterworker/app-masterworker.tesh | 4 ++-- .../cloud-masterworker.tesh | 2 +- .../msg/dht-kademlia/dht-kademlia.tesh | 2 +- .../deprecated/msg/dht-pastry/dht-pastry.tesh | 2 +- .../deprecated/msg/energy-vm/energy-vm.tesh | 2 +- .../platform-failures/platform-failures.tesh | 6 +++--- .../msg/process-create/process-create.tesh | 2 +- .../synchro-semaphore/synchro-semaphore.tesh | 2 +- .../trace-categories/trace-categories.tesh | 2 +- .../trace-host-user-variables.tesh | 4 ++-- .../trace-link-user-variables.tesh | 2 +- .../trace-masterworker.tesh | 8 ++++---- .../trace-process-migration.tesh | 2 +- .../trace-route-user-variables.tesh | 2 +- .../simdag/dag-dotload/sd_dag-dotload.tesh | 4 ++-- .../deprecated/simdag/daxload/sd_daxload.tesh | 4 ++-- examples/deprecated/simdag/fail/sd_fail.tesh | 2 +- .../simdag/properties/sd_properties.tesh | 2 +- .../simdag/ptg-dotload/sd_ptg-dotload.tesh | 2 +- .../schedule-dotload/sd_schedule-dotload.tesh | 4 ++-- .../simdag/scheduling/sd_scheduling.tesh | 2 +- examples/deprecated/simdag/test/sd_test.tesh | 2 +- .../simdag/throttling/sd_throttling.tesh | 2 +- .../simdag/typed_tasks/sd_typed_tasks.tesh | 2 +- .../s4u/actor-create/s4u-actor-create.tesh | 2 +- .../s4u/actor-daemon/s4u-actor-daemon.tesh | 2 +- .../s4u/actor-exiting/s4u-actor-exiting.tesh | 2 +- examples/s4u/actor-join/s4u-actor-join.tesh | 2 +- examples/s4u/actor-kill/s4u-actor-kill.tesh | 2 +- .../actor-lifetime/s4u-actor-lifetime.tesh | 2 +- .../s4u/actor-migrate/s4u-actor-migrate.tesh | 2 +- .../s4u/actor-suspend/s4u-actor-suspend.tesh | 2 +- examples/s4u/actor-yield/s4u-actor-yield.tesh | 2 +- .../app-bittorrent/s4u-app-bittorrent.tesh | 2 +- .../s4u/app-chainsend/s4u-app-chainsend.tesh | 2 +- .../s4u-app-masterworkers.tesh | 4 ++-- .../s4u/app-pingpong/s4u-app-pingpong.tesh | 14 ++++++------- .../s4u/app-pingpong/simix-breakpoint.tesh | 2 +- .../app-token-ring/s4u-app-token-ring.tesh | 6 +++--- examples/s4u/async-ready/s4u-async-ready.tesh | 2 +- examples/s4u/async-wait/s4u-async-wait.tesh | 2 +- .../s4u/async-waitall/s4u-async-waitall.tesh | 2 +- .../s4u/async-waitany/s4u-async-waitany.tesh | 2 +- .../async-waituntil/s4u-async-waituntil.tesh | 2 +- .../s4u/cloud-capping/s4u-cloud-capping.tesh | 2 +- .../cloud-migration/s4u-cloud-migration.tesh | 2 +- .../s4u/cloud-simple/s4u-cloud-simple.tesh | 2 +- examples/s4u/dht-chord/s4u-dht-chord.tesh | 2 +- .../s4u/dht-kademlia/s4u-dht-kademlia.tesh | 2 +- examples/s4u/energy-boot/s4u-energy-boot.tesh | 4 ++-- examples/s4u/energy-exec/s4u-energy-exec.tesh | 4 ++-- examples/s4u/energy-link/s4u-energy-link.tesh | 4 ++-- examples/s4u/energy-vm/s4u-energy-vm.tesh | 2 +- .../s4u-engine-filtering.tesh | 2 +- examples/s4u/exec-async/s4u-exec-async.tesh | 2 +- examples/s4u/exec-basic/s4u-exec-basic.tesh | 2 +- examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh | 4 ++-- examples/s4u/exec-ptask/s4u-exec-ptask.tesh | 2 +- examples/s4u/exec-remote/s4u-exec-remote.tesh | 2 +- examples/s4u/io-async/s4u-io-async.tesh | 2 +- .../io-file-remote/s4u-io-file-remote.tesh | 2 +- .../io-file-system/s4u-io-file-system.tesh | 2 +- .../io-storage-raw/s4u-io-storage-raw.tesh | 2 +- examples/s4u/maestro-set/s4u-maestro-set.tesh | 2 +- .../s4u-platform-failures.tesh | 4 ++-- .../s4u-platform-profile.tesh | 2 +- .../s4u-platform-properties.tesh | 2 +- .../plugin-hostload/s4u-plugin-hostload.tesh | 2 +- .../s4u-routing-get-clusters.tesh | 4 ++-- .../synchro-barrier/s4u-synchro-barrier.tesh | 8 ++++---- .../s4u/synchro-mutex/s4u-synchro-mutex.tesh | 2 +- .../s4u-synchro-semaphore.tesh | 2 +- .../trace-platform/s4u-trace-platform.tesh | 2 +- teshsuite/lua/lua_platforms.tesh | 2 +- .../mc/dwarf-expression/dwarf-expression.tesh | 2 +- teshsuite/mc/dwarf/dwarf.tesh | 2 +- .../msg/app-chainsend/app-chainsend.tesh | 2 +- teshsuite/msg/app-pingpong/app-pingpong.tesh | 14 ++++++------- .../msg/app-token-ring/app-token-ring.tesh | 6 +++--- teshsuite/msg/async-wait/async-wait.tesh | 8 ++++---- .../msg/async-waitall/async-waitall.tesh | 2 +- .../msg/async-waitany/async-waitany.tesh | 2 +- .../msg/cloud-capping/cloud-capping.tesh | 2 +- .../msg/cloud-migration/cloud-migration.tesh | 2 +- teshsuite/msg/cloud-simple/cloud-simple.tesh | 2 +- .../msg/cloud-two-tasks/cloud-two-tasks.tesh | 2 +- .../energy-consumption.tesh | 4 ++-- .../msg/energy-pstate/energy-pstate.tesh | 4 ++-- teshsuite/msg/energy-ptask/energy-ptask.tesh | 2 +- .../msg/io-file-remote/io-file-remote.tesh | 2 +- .../msg/io-raw-storage/io-raw-storage.tesh | 2 +- .../platform-properties.tesh | 2 +- .../msg/plugin-hostload/plugin-hostload.tesh | 2 +- .../msg/process-daemon/process-daemon.tesh | 2 +- teshsuite/msg/process-join/process-join.tesh | 2 +- teshsuite/msg/process-kill/process-kill.tesh | 2 +- .../process-lifetime/process-lifetime.tesh | 8 ++++---- .../process-migration/process-migration.tesh | 2 +- .../msg/process-suspend/process-suspend.tesh | 2 +- .../msg/process-yield/process-yield.tesh | 2 +- .../msg/task-priority/task-priority.tesh | 2 +- .../s4u/actor-migration/actor-migration.tesh | 2 +- .../cloud-interrupt-migration.tesh | 2 +- .../s4u/concurrent_rw/concurrent_rw.tesh | 2 +- .../storage_client_server.tesh | 2 +- teshsuite/simdag/flatifier/flatifier.tesh | 20 +++++++++---------- teshsuite/surf/lmm_usage/lmm_usage.tesh | 2 +- .../surf/maxmin_bench/maxmin_bench_large.tesh | 2 +- .../maxmin_bench/maxmin_bench_medium.tesh | 2 +- .../surf/maxmin_bench/maxmin_bench_small.tesh | 2 +- teshsuite/surf/surf_usage/surf_usage.tesh | 2 +- teshsuite/surf/surf_usage2/surf_usage2.tesh | 2 +- teshsuite/xbt/log_usage/log_usage.tesh | 8 ++++---- teshsuite/xbt/log_usage/log_usage_ndebug.tesh | 2 +- teshsuite/xbt/parmap_bench/parmap_bench.tesh | 2 +- tools/cmake/scripts/update_tesh.pl | 2 -- 118 files changed, 173 insertions(+), 175 deletions(-) diff --git a/examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh b/examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh index 622ea9f99c..804297574a 100644 --- a/examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh +++ b/examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh @@ -2,7 +2,7 @@ p Testing a simple master/worker example application -$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${platfdir}/multicore_machine.xml ${srcdir}/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ./app-masterworker/app-masterworker ${platfdir}/multicore_machine.xml ${srcdir}/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'Full' > [ 0.000000] (1:master@Tremblay) Got 6 workers and 20 tasks to process diff --git a/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh index 16ac3e19ce..44ae31f99e 100644 --- a/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh +++ b/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh @@ -2,7 +2,7 @@ p Testing a simple master/worker example application -$ $SG_TEST_EXENV ${bindir}/app-masterworker ${platfdir}/vivaldi.xml ${srcdir}/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/app-masterworker ${platfdir}/vivaldi.xml ${srcdir}/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/latency-factor' to '1.0' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth-factor' to '1.0' > [ 0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process diff --git a/examples/deprecated/msg/app-masterworker/app-masterworker.tesh b/examples/deprecated/msg/app-masterworker/app-masterworker.tesh index 91e3d7a488..f5343be912 100644 --- a/examples/deprecated/msg/app-masterworker/app-masterworker.tesh +++ b/examples/deprecated/msg/app-masterworker/app-masterworker.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application (mailbox version) ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/app-masterworker$EXEEXT ${platfdir}/small_platform_with_routers.xml ${srcdir}/app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir}/app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" @@ -34,7 +34,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-masterworker$EXEEXT ${platfdir}/small_platform > [ 5.094868] (0:maestro@) Simulation time 5.09487 > [ 5.094868] (6:worker@Bourassa) I'm done. See you! -$ $SG_TEST_EXENV ${bindir:=.}/app-masterworker$EXEEXT ${platfdir}/small_platform_with_routers.xml ${srcdir}/app-masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir}/app-masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" > [ 0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "worker-1" diff --git a/examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh b/examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh index 24813d1ee2..f4abd36e91 100644 --- a/examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh +++ b/examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh @@ -2,7 +2,7 @@ p Testing the Cloud API with a simple master/workers -$ $SG_TEST_EXENV ${bindir:=.}/cloud-masterworker$EXEEXT --log=no_loc ${platfdir}/cluster_backbone.xml +$ ${bindir:=.}/cloud-masterworker --log=no_loc ${platfdir}/cluster_backbone.xml > [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] # Launch 2 VMs > [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] create VM00 on PM(node-1.simgrid.org) > [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] put a process (WRK00) on VM00 diff --git a/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh b/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh index 577c2995c9..7825b34c4e 100644 --- a/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh +++ b/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh @@ -3,7 +3,7 @@ p Testing the Kademlia implementation with MSG ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" +$ ${bindir:=.}/dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" > [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 > [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 > [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 diff --git a/examples/deprecated/msg/dht-pastry/dht-pastry.tesh b/examples/deprecated/msg/dht-pastry/dht-pastry.tesh index fc66316b90..c2aedae28d 100644 --- a/examples/deprecated/msg/dht-pastry/dht-pastry.tesh +++ b/examples/deprecated/msg/dht-pastry/dht-pastry.tesh @@ -2,7 +2,7 @@ p Testing the Pastry implementation with MSG -$ $SG_TEST_EXENV ${bindir:=.}/dht-pastry$EXEEXT -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir}/dht-pastry_d.xml --log=msg_pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/dht-pastry -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir}/dht-pastry_d.xml --log=msg_pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 25.007806] (1:node@node-0.simgrid.org) Task update from 366680 !!! > [ 25.007806] (1:node@node-0.simgrid.org) Node: > [ 25.007806] (1:node@node-0.simgrid.org) Id: 42 '0000002a' diff --git a/examples/deprecated/msg/energy-vm/energy-vm.tesh b/examples/deprecated/msg/energy-vm/energy-vm.tesh index b8ab020d5c..ba4dbdfe66 100644 --- a/examples/deprecated/msg/energy-vm/energy-vm.tesh +++ b/examples/deprecated/msg/energy-vm/energy-vm.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption in case of VMs -$ ${bindir:=.}/energy-vm$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs@MyHost1) Creating and starting two VMs > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: one inside a VM, the other directly on the host diff --git a/examples/deprecated/msg/platform-failures/platform-failures.tesh b/examples/deprecated/msg/platform-failures/platform-failures.tesh index b903537584..2eacc0fee0 100644 --- a/examples/deprecated/msg/platform-failures/platform-failures.tesh +++ b/examples/deprecated/msg/platform-failures/platform-failures.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +$ ${bindir:=.}/platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -108,7 +108,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:criti p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +$ ${bindir:=.}/platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -217,4 +217,4 @@ p complex with such an integration test. One day, we will setup a set of p unit tests for the surf solver, and such issues will be addressable again. p For the time being, I just give up, sorry. -p $ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +p $ ${bindir:=.}/platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose diff --git a/examples/deprecated/msg/process-create/process-create.tesh b/examples/deprecated/msg/process-create/process-create.tesh index 01f5c97295..fbcf897551 100644 --- a/examples/deprecated/msg/process-create/process-create.tesh +++ b/examples/deprecated/msg/process-create/process-create.tesh @@ -1,4 +1,4 @@ #!/usr/bin/env tesh p Start remote processes -$ $SG_TEST_EXENV ${bindir:=.}/process-create$EXEEXT ${platfdir}/small_platform.xml +$ ${bindir:=.}/process-create ${platfdir}/small_platform.xml diff --git a/examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh b/examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh index 5a55609f4f..75a9068dd5 100644 --- a/examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh +++ b/examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh @@ -3,7 +3,7 @@ p Testing synchronization with semaphores ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:Alice@Fafard) Trying to acquire 1 > [ 0.000000] (1:Alice@Fafard) Acquired 1 > [ 0.900000] (2:Bob@Fafard) Trying to acquire 1 diff --git a/examples/deprecated/msg/trace-categories/trace-categories.tesh b/examples/deprecated/msg/trace-categories/trace-categories.tesh index 418f449956..b0687c97ba 100644 --- a/examples/deprecated/msg/trace-categories/trace-categories.tesh +++ b/examples/deprecated/msg/trace-categories/trace-categories.tesh @@ -2,7 +2,7 @@ p Tracing multiple categories master/worker application -$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-categories --cfg=tracing:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' diff --git a/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh b/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh index 562364fb74..6124de2187 100644 --- a/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh +++ b/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Tracing user variables for hosts -$ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-host-user-variables --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' > [0.004078] [msg_test/INFO] Declared host variables: @@ -19,4 +19,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT --cfg=tracing:yes $ rm -f simgrid.trace p Not tracing user variables -$ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-host-user-variables ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml diff --git a/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh b/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh index f143566534..c79c43357d 100644 --- a/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh +++ b/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Trace user variables associated to links of the platform file -$ $SG_TEST_EXENV ${bindir:=.}/trace-link-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-link-user-variables --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' diff --git a/examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh b/examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh index 89e41f0644..b46083d551 100644 --- a/examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh +++ b/examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Tracing master/worker application -$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-masterworker --cfg=tracing:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' @@ -15,7 +15,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg= > [4.214821] [msg_trace_masterworker/INFO] msmark p Tracing master/worker application with xml config -$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${platfdir}/config_tracing.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-masterworker ${platfdir}/config_tracing.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace' @@ -29,10 +29,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${platfdir}/config_traci > [4.214821] [msg_trace_masterworker/INFO] msmark p Not tracing master/worker application -$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-masterworker ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml p Testing tracing by process -$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-masterworker --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace' diff --git a/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh b/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh index 0c3ab46903..319a3e6509 100644 --- a/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh +++ b/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Tracing processes -$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.xml +$ ${bindir:=.}/trace-process-migration --cfg=tracing:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'procmig.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' diff --git a/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh b/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh index d372bcac80..54a1ed3f9a 100644 --- a/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh +++ b/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Trace user variables associated to links of the platform file -$ $SG_TEST_EXENV ${bindir:=.}/trace-route-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/trace-route-user-variables --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' diff --git a/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh index 929c084a6c..bf07071f62 100644 --- a/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh +++ b/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh @@ -4,7 +4,7 @@ p Test the loader of DAG written in the DOT format # The order differ when executed with gcc's thread sanitizer ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag.dot +$ ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -217,7 +217,7 @@ $ cat ${srcdir:=.}/dag-dotload/dag.trace $ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dot.dot ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot +$ ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 1 is in a cycle diff --git a/examples/deprecated/simdag/daxload/sd_daxload.tesh b/examples/deprecated/simdag/daxload/sd_daxload.tesh index 6294772cb3..44fe501bfb 100644 --- a/examples/deprecated/simdag/daxload/sd_daxload.tesh +++ b/examples/deprecated/simdag/daxload/sd_daxload.tesh @@ -2,7 +2,7 @@ p Test the DAX loader on a small DAX instance ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/smalldax.xml +$ ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/smalldax.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] Ignore file o1 size redefinition from 1000000 to 304 > [0.000000] [sd_daxparse/WARNING] Ignore file o2 size redefinition from 1000000 to 304 @@ -127,7 +127,7 @@ $ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace p Test the DAX loader with a DAX comprising a cycle. ! expect return 255 -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml +$ ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [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/deprecated/simdag/fail/sd_fail.tesh b/examples/deprecated/simdag/fail/sd_fail.tesh index 4586cf8d98..965cace8f9 100644 --- a/examples/deprecated/simdag/fail/sd_fail.tesh +++ b/examples/deprecated/simdag/fail/sd_fail.tesh @@ -2,7 +2,7 @@ p Test of the management of failed tasks simdag -$ $SG_TEST_EXENV ${bindir:=.}/fail/sd_fail ${srcdir:=.}/../../platforms/faulty_host.xml +$ ${bindir:=.}/fail/sd_fail ${srcdir:=.}/../../platforms/faulty_host.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_fail/INFO] First test: COMP_SEQ task > [0.000000] [sd_fail/INFO] Schedule task 'Poor task' on 'Faulty Host' diff --git a/examples/deprecated/simdag/properties/sd_properties.tesh b/examples/deprecated/simdag/properties/sd_properties.tesh index 80abf864aa..cf3d6a478a 100644 --- a/examples/deprecated/simdag/properties/sd_properties.tesh +++ b/examples/deprecated/simdag/properties/sd_properties.tesh @@ -2,7 +2,7 @@ p Simple test of simdag with properties -$ $SG_TEST_EXENV properties/sd_properties ${srcdir:=.}/../../platforms/prop.xml +$ properties/sd_properties ${srcdir:=.}/../../platforms/prop.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Property list for host host1 > [0.000000] [test/INFO] Property: mem has value: 4 diff --git a/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh index 8861c46957..b11294f218 100644 --- a/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh +++ b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh @@ -4,7 +4,7 @@ p Test the loader of PTG (Parallel Task Graph) written in the DOT format # The order differ when executed with gcc's thread sanitizer ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/ptg-dotload/ptg.dot +$ ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/ptg-dotload/ptg.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root diff --git a/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh index b679780c35..b89f94668b 100644 --- a/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh +++ b/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh @@ -2,7 +2,7 @@ p Test the loader of DAG written in the DOT format ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot +$ ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task 'end' can not be scheduled on -1 hosts > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task '1' can not be scheduled on 0 hosts @@ -15,7 +15,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc # The order differ when executed with gcc's thread sanitizer ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot +$ ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root diff --git a/examples/deprecated/simdag/scheduling/sd_scheduling.tesh b/examples/deprecated/simdag/scheduling/sd_scheduling.tesh index 82069b3fa9..54c637cee7 100644 --- a/examples/deprecated/simdag/scheduling/sd_scheduling.tesh +++ b/examples/deprecated/simdag/scheduling/sd_scheduling.tesh @@ -2,7 +2,7 @@ p Simple test of simdag -$ $SG_TEST_EXENV ${bindir:=.}/scheduling/sd_scheduling --log=sd_daxparse.thresh:critical ${srcdir:=.}/../../platforms/simulacrum_7_hosts.xml ${srcdir:=.}/scheduling/Montage_25.xml +$ ${bindir:=.}/scheduling/sd_scheduling --log=sd_daxparse.thresh:critical ${srcdir:=.}/../../platforms/simulacrum_7_hosts.xml ${srcdir:=.}/scheduling/Montage_25.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26 diff --git a/examples/deprecated/simdag/test/sd_test.tesh b/examples/deprecated/simdag/test/sd_test.tesh index 7f03ba0b40..13cd10f472 100644 --- a/examples/deprecated/simdag/test/sd_test.tesh +++ b/examples/deprecated/simdag/test/sd_test.tesh @@ -3,7 +3,7 @@ p Simple test of simdag ! output sort -$ $SG_TEST_EXENV ./test/sd_test ${srcdir:=.}/../../platforms/small_platform.xml +$ ./test/sd_test ${srcdir:=.}/../../platforms/small_platform.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on Jacquelin: 0.014563 > [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on Fafard: 0.013107 diff --git a/examples/deprecated/simdag/throttling/sd_throttling.tesh b/examples/deprecated/simdag/throttling/sd_throttling.tesh index e52369a506..a389778160 100644 --- a/examples/deprecated/simdag/throttling/sd_throttling.tesh +++ b/examples/deprecated/simdag/throttling/sd_throttling.tesh @@ -4,7 +4,7 @@ p Modify the rate of communication tasks even when they are auto-scheduled # We need to sort this out because the order changes with the sanitizers (at least) ! output sort -$ $SG_TEST_EXENV ./throttling/sd_throttling ${srcdir:=.}/../../platforms/cluster_backbone.xml +$ ./throttling/sd_throttling ${srcdir:=.}/../../platforms/cluster_backbone.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [5.000000] [sd_comm_throttling/INFO] Simulation stopped after 5.0000 seconds > [5.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 5.000000 diff --git a/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh b/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh index 3d2c6e1d02..f719abf453 100644 --- a/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh +++ b/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh @@ -2,7 +2,7 @@ p Usage test of simdag's typed tasks ! output sort -$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../../platforms/cluster_backbone.xml +$ ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../../platforms/cluster_backbone.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000 > [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.400000 diff --git a/examples/s4u/actor-create/s4u-actor-create.tesh b/examples/s4u/actor-create/s4u-actor-create.tesh index 58a2574242..994a3f95d2 100644 --- a/examples/s4u/actor-create/s4u-actor-create.tesh +++ b/examples/s4u/actor-create/s4u-actor-create.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-create +$ ${bindir:=.}/s4u-actor-create > [Tremblay:sender1:(2) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send > [Jupiter:sender2:(3) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send > [Fafard:sender:(4) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh index 5f7cb69aa9..82593d20c6 100644 --- a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh +++ b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh @@ -2,7 +2,7 @@ p Testing the process daemonization feature -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-daemon ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-daemon ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin). > [ 0.000000] (daemon@Tremblay) Hello from the infinite loop > [ 3.000000] (daemon@Tremblay) Hello from the infinite loop diff --git a/examples/s4u/actor-exiting/s4u-actor-exiting.tesh b/examples/s4u/actor-exiting/s4u-actor-exiting.tesh index d5a15ed8d2..703cee5b5e 100644 --- a/examples/s4u/actor-exiting/s4u-actor-exiting.tesh +++ b/examples/s4u/actor-exiting/s4u-actor-exiting.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 10.194200] (A@Tremblay) I stop now > [ 10.194200] (maestro@) Actor A stops now > [ 26.213694] (maestro@) Actor B stops now diff --git a/examples/s4u/actor-join/s4u-actor-join.tesh b/examples/s4u/actor-join/s4u-actor-join.tesh index b03b3e2ec7..bf1b1536ee 100644 --- a/examples/s4u/actor-join/s4u-actor-join.tesh +++ b/examples/s4u/actor-join/s4u-actor-join.tesh @@ -1,4 +1,4 @@ -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-join$EXEEXT ${platfdir}/small_platform.xml +$ ${bindir:=.}/s4u-actor-join ${platfdir}/small_platform.xml > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Start sleeper > [Tremblay:sleeper from master:(2) 0.000000] [s4u_test/INFO] Sleeper started > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Join the sleeper (timeout 2) diff --git a/examples/s4u/actor-kill/s4u-actor-kill.tesh b/examples/s4u/actor-kill/s4u-actor-kill.tesh index ba2afdcb46..603cd8d23e 100644 --- a/examples/s4u/actor-kill/s4u-actor-kill.tesh +++ b/examples/s4u/actor-kill/s4u-actor-kill.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (killer@Tremblay) Hello! > [ 0.000000] (victim A@Fafard) Hello! > [ 0.000000] (victim A@Fafard) Suspending myself diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh index 2a70e45941..c3d3b15a29 100644 --- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh +++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster_backbone.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster_backbone.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep. diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh index ef8867aa36..6b05f06952 100644 --- a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh +++ b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh @@ -2,7 +2,7 @@ p Testing the actor migration feature -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin) > [ 5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh index 840b48251f..a443c7fc4f 100644 --- a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh +++ b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh @@ -3,7 +3,7 @@ p Testing the suspend/resume feature of S4U ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-suspend ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-suspend ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (dream_master@Boivin) Let's create a lazy guy. > [ 0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep. > [ 0.000000] (dream_master@Boivin) Let's wait a little bit... diff --git a/examples/s4u/actor-yield/s4u-actor-yield.tesh b/examples/s4u/actor-yield/s4u-actor-yield.tesh index b61c4f2c3d..69503ff507 100644 --- a/examples/s4u/actor-yield/s4u-actor-yield.tesh +++ b/examples/s4u/actor-yield/s4u-actor-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-yield ${platfdir}/small_platform_fatpipe.xml s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-yield ${platfdir}/small_platform_fatpipe.xml s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now! > [ 0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now! diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh index a72f286368..c4790e71d8 100644 --- a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh +++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh @@ -4,7 +4,7 @@ p Testing the Bittorrent implementation with S4U ! timeout 10 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-bittorrent ${platfdir}/cluster_backbone.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-bittorrent ${platfdir}/cluster_backbone.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:tracker@node-0.simgrid.org) Tracker launched. > [ 0.000000] (2:peer@node-1.simgrid.org) Hi, I'm joining the network with id 2 > [ 0.000000] (3:peer@node-2.simgrid.org) Hi, I'm joining the network with id 3 diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh index db1425576f..c025625828 100644 --- a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh +++ b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh @@ -4,7 +4,7 @@ p Testing the chainsend S4U implementation ! timeout 60 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated). > [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). > [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated). diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh b/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh index 4abff1312c..a1e38caba5 100644 --- a/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh +++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh @@ -3,7 +3,7 @@ p Testing a simple master/workers example application ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-masterworkers-class$EXEEXT ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-masterworkers-class ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (master@Tremblay) Sending task 0 of 20 to mailbox 'Tremblay' > [ 0.002265] (master@Tremblay) Sending task 1 of 20 to mailbox 'Jupiter' @@ -34,7 +34,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-masterworkers-class$EXEEXT ${platfdir}/sma > [ 5.133855] (worker@Bourassa) Exiting now. ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-masterworkers-fun$EXEEXT ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-masterworkers-fun ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (master@Tremblay) Sending task 0 of 20 to mailbox 'Tremblay' > [ 0.002265] (master@Tremblay) Sending task 1 of 20 to mailbox 'Jupiter' diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh index 8140c6929c..fa82acc6c7 100644 --- a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh +++ b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh @@ -2,7 +2,7 @@ p Testing with default compound -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 > [ 0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound) @@ -14,7 +14,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform p Testing with default compound Full network optimization -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/optim' to 'Full' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 @@ -27,7 +27,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform p Testing the deprecated CM02 network model -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 @@ -41,7 +41,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform p Testing the surf network Reno fairness model using lagrangian approach -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml "--cfg=host/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" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--cfg=host/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:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno' @@ -56,7 +56,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform p Testing the surf network Reno2 fairness model using lagrangian approach -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno2" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno2" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno2' @@ -71,7 +71,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform p Testing the surf network Vegas fairness model using lagrangian approach -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas' @@ -86,7 +86,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform p Testing the surf network constant model -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform_constant.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform_constant.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' diff --git a/examples/s4u/app-pingpong/simix-breakpoint.tesh b/examples/s4u/app-pingpong/simix-breakpoint.tesh index 7ba0907fe6..b2efa12f70 100644 --- a/examples/s4u/app-pingpong/simix-breakpoint.tesh +++ b/examples/s4u/app-pingpong/simix-breakpoint.tesh @@ -3,7 +3,7 @@ p Testing option --cfg=simix/breakpoint ! expect signal SIGTRAP -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=simix/breakpoint:3.1416 +$ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=simix/breakpoint:3.1416 > [ 0.000000] (0:maestro@) Configuration change: Set 'simix/breakpoint' to '3.1416' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh index a22c51b9aa..6429883065 100644 --- a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh +++ b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '6' > [ 0.000000] (0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (1@host2) Host "1" received "Token" @@ -16,7 +16,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml > [ 0.131796] (0@host1) Host "0" received "Token" > [ 0.131796] (maestro@) Simulation time 0.131796 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '2' > [ 0.000000] (0@100030591) Host "0" send 'Token' to Host "1" > [ 0.624423] (1@100036570) Host "1" received "Token" @@ -24,7 +24,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--lo > [ 1.248846] (0@100030591) Host "0" received "Token" > [ 1.248846] (maestro@) Simulation time 1.24885 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '60' > [ 0.000000] (0@host-1.cluster1) Host "0" send 'Token' to Host "1" > [ 0.030364] (1@host-1.cluster2) Host "1" received "Token" diff --git a/examples/s4u/async-ready/s4u-async-ready.tesh b/examples/s4u/async-ready/s4u-async-ready.tesh index 008c23cc97..d5d259156b 100644 --- a/examples/s4u/async-ready/s4u-async-ready.tesh +++ b/examples/s4u/async-ready/s4u-async-ready.tesh @@ -2,7 +2,7 @@ p Test1 Peer sending and receiving -$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-ready ${platfdir}/small_platform_fatpipe.xml s4u-async-ready_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-async-ready ${platfdir}/small_platform_fatpipe.xml s4u-async-ready_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:peer@Tremblay) Send 'Message 0 from peer 0' to 'peer-1' > [ 0.000000] (2:peer@Ruby) Send 'Message 0 from peer 1' to 'peer-0' > [ 0.000000] (1:peer@Tremblay) Send 'Message 0 from peer 0' to 'peer-2' diff --git a/examples/s4u/async-wait/s4u-async-wait.tesh b/examples/s4u/async-wait/s4u-async-wait.tesh index 8f9f795da9..dcdaac0b28 100644 --- a/examples/s4u/async-wait/s4u-async-wait.tesh +++ b/examples/s4u/async-wait/s4u-async-wait.tesh @@ -2,7 +2,7 @@ p Test1 Sleep_sender > Sleep_receiver -$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-wait ${platfdir}/small_platform_fatpipe.xml s4u-async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-async-wait ${platfdir}/small_platform_fatpipe.xml s4u-async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver-0' diff --git a/examples/s4u/async-waitall/s4u-async-waitall.tesh b/examples/s4u/async-waitall/s4u-async-waitall.tesh index bdec4c962b..04168e495d 100644 --- a/examples/s4u/async-waitall/s4u-async-waitall.tesh +++ b/examples/s4u/async-waitall/s4u-async-waitall.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-waitall ${platfdir}/small_platform_fatpipe.xml s4u-async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-async-waitall ${platfdir}/small_platform_fatpipe.xml s4u-async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (3:receiver@Perl) Wait for my first message diff --git a/examples/s4u/async-waitany/s4u-async-waitany.tesh b/examples/s4u/async-waitany/s4u-async-waitany.tesh index 27eec6bcaa..5f3dee8dc2 100644 --- a/examples/s4u/async-waitany/s4u-async-waitany.tesh +++ b/examples/s4u/async-waitany/s4u-async-waitany.tesh @@ -3,7 +3,7 @@ p Testing this_actor->wait_any() ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-waitany ${platfdir}/small_platform.xml s4u-async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-async-waitany ${platfdir}/small_platform.xml s4u-async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Fafard) Wait for my first message > [ 0.000000] (3:receiver@Jupiter) Wait for my first message diff --git a/examples/s4u/async-waituntil/s4u-async-waituntil.tesh b/examples/s4u/async-waituntil/s4u-async-waituntil.tesh index 6d77ade03d..c3f2bc508c 100644 --- a/examples/s4u/async-waituntil/s4u-async-waituntil.tesh +++ b/examples/s4u/async-waituntil/s4u-async-waituntil.tesh @@ -2,7 +2,7 @@ p Test1 Sleep_sender > Sleep_receiver -$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-waituntil ${platfdir}/small_platform_fatpipe.xml s4u-async-waituntil_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-async-waituntil ${platfdir}/small_platform_fatpipe.xml s4u-async-waituntil_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver-0' diff --git a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh b/examples/s4u/cloud-capping/s4u-cloud-capping.tesh index 0911d20f09..31ddb72653 100644 --- a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh +++ b/examples/s4u/cloud-capping/s4u-cloud-capping.tesh @@ -1,5 +1,5 @@ ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) # 1. Put a single task on a PM. > [ 0.000000] (1:master_@Fafard) ### Test: with/without task set_bound > [ 0.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard diff --git a/examples/s4u/cloud-migration/s4u-cloud-migration.tesh b/examples/s4u/cloud-migration/s4u-cloud-migration.tesh index f18aa46a11..02628ea332 100644 --- a/examples/s4u/cloud-migration/s4u-cloud-migration.tesh +++ b/examples/s4u/cloud-migration/s4u-cloud-migration.tesh @@ -1,4 +1,4 @@ -$ $SG_TEST_EXENV ${bindir:=.}/s4u-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Test: Migrate a VM with 1000 Mbytes RAM > [132.765801] (1:master_@Fafard) VM0 migrated: Fafard->Tremblay in 132.766 s > [132.765801] (1:master_@Fafard) Test: Migrate a VM with 100 Mbytes RAM diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh b/examples/s4u/cloud-simple/s4u-cloud-simple.tesh index 87e6c25e4d..6b21017035 100644 --- a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh +++ b/examples/s4u/cloud-simple/s4u-cloud-simple.tesh @@ -2,7 +2,7 @@ p Testing a vm with two successive tasks -$ $SG_TEST_EXENV ${bindir:=.}/s4u-cloud-simple$EXEEXT --log=no_loc ${platfdir:=.}/small_platform.xml +$ ${bindir:=.}/s4u-cloud-simple --log=no_loc ${platfdir:=.}/small_platform.xml > [Fafard:master_:(1) 0.000000] [s4u_test/INFO] ## Test 1 (started): check computation on normal PMs > [Fafard:master_:(1) 0.000000] [s4u_test/INFO] ### Put a task on a PM > [Fafard:compute:(2) 0.013107] [s4u_test/INFO] Fafard:compute task executed 0.0131068 diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh index dab06c1616..9e8fe7c93d 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord.tesh +++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh @@ -3,7 +3,7 @@ p Testing the Chord implementation with S4U ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-chord$EXEEXT -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-dht-chord -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n" > [ 0.00000] (node@node-0.simgrid.org) My finger table: > [ 0.00000] (node@node-0.simgrid.org) Start | Succ > [ 0.00000] (node@node-0.simgrid.org) 3 | 42 diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh index 4370d1588e..b92c7a6924 100644 --- a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh +++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh @@ -3,7 +3,7 @@ p Testing the Kademlia implementation with S4U ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" > [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 > [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 > [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 diff --git a/examples/s4u/energy-boot/s4u-energy-boot.tesh b/examples/s4u/energy-boot/s4u-energy-boot.tesh index 9c6a7ad0f2..7a1c3016a6 100644 --- a/examples/s4u/energy-boot/s4u-energy-boot.tesh +++ b/examples/s4u/energy-boot/s4u-energy-boot.tesh @@ -2,7 +2,7 @@ p Modeling the host energy consumption during boot and shutdown -$ ${bindir:=.}/s4u-energy-boot$EXEEXT ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:Boot Monitor@MyHost2) Initial pstate: 0; Energy dissipated so far:0E+00 J > [ 0.000000] (1:Boot Monitor@MyHost2) Sleep for 10 seconds > [ 10.000000] (1:Boot Monitor@MyHost2) Done sleeping. Current pstate: 0; Energy dissipated so far: 950.00 J @@ -23,7 +23,7 @@ $ ${bindir:=.}/s4u-energy-boot$EXEEXT ${srcdir:=.}/platform_boot.xml "--log=root > [177.000000] (0:maestro@) Energy consumption of host MyHost1: 19820.000000 Joules > [177.000000] (0:maestro@) Energy consumption of host MyHost2: 17700.000000 Joules -$ ${bindir:=.}/s4u-energy-boot$EXEEXT ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:Boot Monitor@MyHost2) Initial pstate: 0; Energy dissipated so far:0E+00 J diff --git a/examples/s4u/energy-exec/s4u-energy-exec.tesh b/examples/s4u/energy-exec/s4u-energy-exec.tesh index ab583ae84b..e475904c6f 100644 --- a/examples/s4u/energy-exec/s4u-energy-exec.tesh +++ b/examples/s4u/energy-exec/s4u-energy-exec.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption -$ ${bindir:=.}/s4u-energy-exec$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds @@ -22,7 +22,7 @@ $ ${bindir:=.}/s4u-energy-exec$EXEEXT ${platfdir}/energy_platform.xml "--log=roo > [ 30.000000] (0:maestro@) Energy consumption of host MyHost2: 2100.000000 Joules > [ 30.000000] (0:maestro@) Energy consumption of host MyHost3: 3000.000000 Joules -$ ${bindir:=.}/s4u-energy-exec$EXEEXT ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 diff --git a/examples/s4u/energy-link/s4u-energy-link.tesh b/examples/s4u/energy-link/s4u-energy-link.tesh index 1e1c65da7b..c3b63c95e9 100644 --- a/examples/s4u/energy-link/s4u-energy-link.tesh +++ b/examples/s4u/energy-link/s4u-energy-link.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing link energy consumption (using CM02 as a network model) -$ ${bindir:=.}/s4u-energy-link$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Activating the SimGrid link energy plugin @@ -15,7 +15,7 @@ $ ${bindir:=.}/s4u-energy-link$EXEEXT ${platfdir}/energy_platform.xml "--log=ro p And now test with 500000 bytes -$ ${bindir:=.}/s4u-energy-link$EXEEXT ${platfdir}/energy_platform.xml 1 50000000 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml 1 50000000 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Activating the SimGrid link energy plugin diff --git a/examples/s4u/energy-vm/s4u-energy-vm.tesh b/examples/s4u/energy-vm/s4u-energy-vm.tesh index 3b8b7accd5..10f5dbf47b 100644 --- a/examples/s4u/energy-vm/s4u-energy-vm.tesh +++ b/examples/s4u/energy-vm/s4u-energy-vm.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption in case of VMs -$ ${bindir:=.}/s4u-energy-vm$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs@MyHost1) Creating and starting two VMs > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: one inside a VM, the other directly on the host diff --git a/examples/s4u/engine-filtering/s4u-engine-filtering.tesh b/examples/s4u/engine-filtering/s4u-engine-filtering.tesh index 07f0d99d85..157a40d43c 100644 --- a/examples/s4u/engine-filtering/s4u-engine-filtering.tesh +++ b/examples/s4u/engine-filtering/s4u-engine-filtering.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Let's filter some hosts... -$ ${bindir:=.}/s4u-engine-filtering$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-engine-filtering ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Hosts currently registered with this engine: 3 diff --git a/examples/s4u/exec-async/s4u-exec-async.tesh b/examples/s4u/exec-async/s4u-exec-async.tesh index 7b5851948e..989c78690e 100644 --- a/examples/s4u/exec-async/s4u-exec-async.tesh +++ b/examples/s4u/exec-async/s4u-exec-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-async$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:wait@Fafard) Execute 7.6296e+07 flops, should take 1 second. > [ 0.000000] (2:monitor@Ginette) Execute 4.8492e+07 flops, should take 1 second. > [ 0.000000] (3:cancel@Boivin) Execute 9.8095e+07 flops, should take 1 second. diff --git a/examples/s4u/exec-basic/s4u-exec-basic.tesh b/examples/s4u/exec-basic/s4u-exec-basic.tesh index 4a453449a9..b4bed5dfb4 100644 --- a/examples/s4u/exec-basic/s4u-exec-basic.tesh +++ b/examples/s4u/exec-basic/s4u-exec-basic.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh p Start remote processes -$ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-basic$EXEEXT ${platfdir}/small_platform.xml +$ ${bindir:=.}/s4u-exec-basic ${platfdir}/small_platform.xml > [Tremblay:privileged:(2) 0.001500] [s4u_test/INFO] Done. > [Tremblay:executor:(1) 0.002000] [s4u_test/INFO] Done. diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh index 3b8a702866..bbc7cb591a 100644 --- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh +++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh @@ -2,7 +2,7 @@ p Testing the DVFS-related functions -$ ${bindir:=.}/s4u-exec-dvfs$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -21,7 +21,7 @@ $ ${bindir:=.}/s4u-exec-dvfs$EXEEXT ${platfdir}/energy_platform.xml "--log=root. > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 -$ ${bindir:=.}/s4u-exec-dvfs$EXEEXT ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh index e8dde985c7..d7cb538346 100644 --- a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh +++ b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-exec-ptask$EXEEXT ${platfdir}/energy_platform.xml --cfg=host/model:ptask_L07 --cfg=tracing:yes --cfg=tracing/uncategorized:yes --log=instr_resource.t:debug --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:ptask_L07 --cfg=tracing:yes --cfg=tracing/uncategorized:yes --log=instr_resource.t:debug --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Configuration change: Set 'tracing' to 'yes' > [ 0.000000] (0:maestro@) Configuration change: Set 'tracing/uncategorized' to 'yes' diff --git a/examples/s4u/exec-remote/s4u-exec-remote.tesh b/examples/s4u/exec-remote/s4u-exec-remote.tesh index 9164daaceb..6819e407b9 100644 --- a/examples/s4u/exec-remote/s4u-exec-remote.tesh +++ b/examples/s4u/exec-remote/s4u-exec-remote.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-remote$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) I'm a wizard! I can run a task on the Ginette host from the Fafard one! Look! > [ 0.000000] (1:test@Fafard) It started. Running 48.492Mf takes exactly one second on Ginette (but not on Fafard). > [ 0.100000] (1:test@Fafard) Loads in flops/s: Boivin=0; Fafard=0; Ginette=48492000 diff --git a/examples/s4u/io-async/s4u-io-async.tesh b/examples/s4u/io-async/s4u-io-async.tesh index 3a32addb26..d2a6acbc23 100644 --- a/examples/s4u/io-async/s4u-io-async.tesh +++ b/examples/s4u/io-async/s4u-io-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-io-async$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-io-async ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:test@bob) Hello! read 20000000 bytes from Storage Disk1 > [ 0.000000] (2:test_cancel@alice) Hello! write 50000000 bytes from Storage Disk2 > [ 0.200000] (1:test@bob) Goodbye now! diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote.tesh b/examples/s4u/io-file-remote/s4u-io-file-remote.tesh index 6781b50453..1f5c26c3c5 100644 --- a/examples/s4u/io-file-remote/s4u-io-file-remote.tesh +++ b/examples/s4u/io-file-remote/s4u-io-file-remote.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-io-file-remote$EXEEXT ${platfdir}/storage/remote_io.xml s4u-io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" +$ ${bindir:=.}/s4u-io-file-remote ${platfdir}/storage/remote_io.xml s4u-io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" > [ 0.000000] (0@ ) Init: 12/476824 MiB used/free on 'Disk1' > [ 0.000000] (0@ ) Init: 2280/474556 MiB used/free on 'Disk2' > [ 0.000000] (1@alice) Opened file 'c:\Windows\setupact.log' diff --git a/examples/s4u/io-file-system/s4u-io-file-system.tesh b/examples/s4u/io-file-system/s4u-io-file-system.tesh index 303cbb313a..54e4fa380d 100644 --- a/examples/s4u/io-file-system/s4u-io-file-system.tesh +++ b/examples/s4u/io-file-system/s4u-io-file-system.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-io-file-system ${platfdir}/storage/storage.xml +$ ${bindir:=.}/s4u-io-file-system ${platfdir}/storage/storage.xml > [denise:host:(1) 0.000000] [s4u_test/INFO] Storage info on denise: > [denise:host:(1) 0.000000] [s4u_test/INFO] Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000. > [denise:host:(1) 0.000000] [s4u_test/INFO] Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000. diff --git a/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh b/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh index 65b09de258..2f507ce183 100644 --- a/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh +++ b/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir}/s4u-io-storage-raw$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/s4u-io-storage-raw ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:@denise) *** Storage info on denise *** > [ 0.000000] (1:@denise) Storage name: Disk2, mount name: c: > [ 0.000000] (1:@denise) Storage name: Disk4, mount name: /home diff --git a/examples/s4u/maestro-set/s4u-maestro-set.tesh b/examples/s4u/maestro-set/s4u-maestro-set.tesh index cf21b21b14..fb1fc8844e 100644 --- a/examples/s4u/maestro-set/s4u-maestro-set.tesh +++ b/examples/s4u/maestro-set/s4u-maestro-set.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-maestro-set$EXEEXT ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-maestro-set ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) I am not the main thread, as expected > [ 0.000000] (2:receiver@Jupiter) I am not the main thread, as expected > [ 0.000000] (1:sender@Tremblay) I am the main thread, as expected diff --git a/examples/s4u/platform-failures/s4u-platform-failures.tesh b/examples/s4u/platform-failures/s4u-platform-failures.tesh index b1acb0b80b..c6be682edd 100644 --- a/examples/s4u/platform-failures/s4u-platform-failures.tesh +++ b/examples/s4u/platform-failures/s4u-platform-failures.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +$ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -108,7 +108,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-failures$EXEEXT --log=xbt_cfg.thres:c p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +$ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process diff --git a/examples/s4u/platform-profile/s4u-platform-profile.tesh b/examples/s4u/platform-profile/s4u-platform-profile.tesh index 11b0d003aa..1d27cf584a 100644 --- a/examples/s4u/platform-profile/s4u-platform-profile.tesh +++ b/examples/s4u/platform-profile/s4u-platform-profile.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-profile ${platfdir}/small_platform_profile.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-platform-profile ${platfdir}/small_platform_profile.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:watcher@Tremblay) Fafard: 25Gflops, Jupiter: 12Gflops, Link1: (1000.00MB/s 10ms), Link2: (1000.00MB/s 10ms) > [ 1.000000] (1:watcher@Tremblay) Fafard: 25Gflops, Jupiter: 12Gflops, Link1: (1000.00MB/s 3ms), Link2: (1000.00MB/s 10ms) > [ 2.000000] (1:watcher@Tremblay) Fafard: 25Gflops, Jupiter: 25Gflops, Link1: (2000.00MB/s 3ms), Link2: (1000.00MB/s 10ms) diff --git a/examples/s4u/platform-properties/s4u-platform-properties.tesh b/examples/s4u/platform-properties/s4u-platform-properties.tesh index b3f7e54b91..9a93d119db 100644 --- a/examples/s4u/platform-properties/s4u-platform-properties.tesh +++ b/examples/s4u/platform-properties/s4u-platform-properties.tesh @@ -3,7 +3,7 @@ p Testing a S4U application with properties in the XML for Hosts, Links and Actors ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${platfdir}/prop.xml s4u-platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-platform-properties ${platfdir}/prop.xml s4u-platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh index f10e2f0de6..0e7319b9ad 100644 --- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh +++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh @@ -2,7 +2,7 @@ p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops) -$ ${bindir:=.}/s4u-plugin-hostload$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-plugin-hostload ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0) and current average load: 0.00000 (should be 0) > [ 0.000000] (1:load_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed) diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh index 7cdeeab957..8dc83c88e4 100644 --- a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh +++ b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh @@ -1,4 +1,4 @@ -$ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluster_multi.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_multi.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) simple > [ 0.000000] (maestro@) node-0.1core.org > [ 0.000000] (maestro@) node-1.1core.org @@ -27,7 +27,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluste > [ 0.000000] (maestro@) node-6.4cores.org > [ 0.000000] (maestro@) node-7.4cores.org -$ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluster_dragonfly.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_dragonfly.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) bob_cluster > [ 0.000000] (maestro@) node-0.simgrid.org > [ 0.000000] (maestro@) node-1.simgrid.org diff --git a/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh b/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh index 56dd082873..a1e7709163 100644 --- a/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh +++ b/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh @@ -1,18 +1,18 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 1 +$ ${bindir:=.}/s4u-synchro-barrier 1 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 0 workers > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Waiting on the barrier > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Bye -$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 2 +$ ${bindir:=.}/s4u-synchro-barrier 2 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 1 workers > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Waiting on the barrier > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Waiting on the barrier > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Bye > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Bye -$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 3 +$ ${bindir:=.}/s4u-synchro-barrier 3 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 2 workers > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Waiting on the barrier > [Jupiter:worker:(3) 0.000000] [s4u_test/INFO] Waiting on the barrier @@ -21,7 +21,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 3 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Bye > [Jupiter:worker:(3) 0.000000] [s4u_test/INFO] Bye -$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 10 +$ ${bindir:=.}/s4u-synchro-barrier 10 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 9 workers > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Waiting on the barrier > [Jupiter:worker:(3) 0.000000] [s4u_test/INFO] Waiting on the barrier diff --git a/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh b/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh index 94bf0ec264..4d1c5e99ef 100644 --- a/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh +++ b/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-mutex +$ ${bindir:=.}/s4u-synchro-mutex > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] I'm done, good bye > [Tremblay:worker:(3) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock diff --git a/examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh b/examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh index d7401708d8..ea805b1e4c 100644 --- a/examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh +++ b/examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-semaphore +$ ${bindir:=.}/s4u-synchro-semaphore > [Tremblay:producer:(1) 0.000000] [s4u_test/INFO] Pushing 'one' > [Jupiter:consumer:(2) 0.000000] [s4u_test/INFO] Receiving 'one' > [Tremblay:producer:(1) 0.000000] [s4u_test/INFO] Pushing 'two' diff --git a/examples/s4u/trace-platform/s4u-trace-platform.tesh b/examples/s4u/trace-platform/s4u-trace-platform.tesh index b4a9ed0ea3..9a50297ae8 100644 --- a/examples/s4u/trace-platform/s4u-trace-platform.tesh +++ b/examples/s4u/trace-platform/s4u-trace-platform.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Tracing platform only -$ $SG_TEST_EXENV ${bindir:=.}/s4u-trace-platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${platfdir}/small_platform.xml +$ ${bindir:=.}/s4u-trace-platform --cfg=tracing:yes --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${platfdir}/small_platform.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_platform.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' diff --git a/teshsuite/lua/lua_platforms.tesh b/teshsuite/lua/lua_platforms.tesh index c39217e686..79a98cbf73 100644 --- a/teshsuite/lua/lua_platforms.tesh +++ b/teshsuite/lua/lua_platforms.tesh @@ -28,7 +28,7 @@ $ ${bindir:=.}/examples/deprecated/msg/app-masterworker/app-masterworker ${srcdi > [Bourassa:worker:(6) 5.133855] [msg_app_masterworker/INFO] I'm done. See you! > [5.133855] [msg_app_masterworker/INFO] Simulation time 5.13386 -$ $SG_TEST_EXENV ${bindir:=.}/teshsuite/msg/app-token-ring/app-token-ring ${srcdir:=.}/examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/teshsuite/msg/app-token-ring/app-token-ring ${srcdir:=.}/examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of hosts '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" diff --git a/teshsuite/mc/dwarf-expression/dwarf-expression.tesh b/teshsuite/mc/dwarf-expression/dwarf-expression.tesh index 471fa94da9..787f2bc040 100644 --- a/teshsuite/mc/dwarf-expression/dwarf-expression.tesh +++ b/teshsuite/mc/dwarf-expression/dwarf-expression.tesh @@ -1,3 +1,3 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/dwarf-expression +$ ${bindir:=.}/dwarf-expression diff --git a/teshsuite/mc/dwarf/dwarf.tesh b/teshsuite/mc/dwarf/dwarf.tesh index 6c3b12c23f..f6c817b27b 100644 --- a/teshsuite/mc/dwarf/dwarf.tesh +++ b/teshsuite/mc/dwarf/dwarf.tesh @@ -1,3 +1,3 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/dwarf +$ ${bindir:=.}/dwarf diff --git a/teshsuite/msg/app-chainsend/app-chainsend.tesh b/teshsuite/msg/app-chainsend/app-chainsend.tesh index f26c3663b9..ddeb69fb91 100644 --- a/teshsuite/msg/app-chainsend/app-chainsend.tesh +++ b/teshsuite/msg/app-chainsend/app-chainsend.tesh @@ -4,7 +4,7 @@ p Testing the chainsend MSG implementation ! timeout 60 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225359 MB/s); copy finished (simulated). > [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). > [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171126 MB/s); copy finished (simulated). diff --git a/teshsuite/msg/app-pingpong/app-pingpong.tesh b/teshsuite/msg/app-pingpong/app-pingpong.tesh index aa9f5c6ebf..46a4387080 100644 --- a/teshsuite/msg/app-pingpong/app-pingpong.tesh +++ b/teshsuite/msg/app-pingpong/app-pingpong.tesh @@ -2,7 +2,7 @@ p Testing with default compound -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml app-pingpong_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:pinger@Tremblay) Ping -> Jupiter > [ 0.000000] (2:ponger@Jupiter) Pong -> Tremblay > [ 0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound) @@ -14,7 +14,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml p Testing with default compound and Full network optimization -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/optim' to 'Full' > [ 0.000000] (1:pinger@Tremblay) Ping -> Jupiter > [ 0.000000] (2:ponger@Jupiter) Pong -> Tremblay @@ -27,7 +27,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml p Testing the deprecated CM02 network model -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml app-pingpong_d.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (1:pinger@Tremblay) Ping -> Jupiter @@ -41,7 +41,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml p Testing the surf network Reno fairness model using lagrangian approach -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=host/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" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=host/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:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno' @@ -56,7 +56,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml p Testing the surf network Reno2 fairness model using lagrangian approach -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno2" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno2" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno2' @@ -71,7 +71,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml p Testing the surf network Vegas fairness model using lagrangian approach -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas' @@ -86,7 +86,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform.xml p Testing the surf network constant model -$ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${platfdir}/small_platform_constant.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-pingpong ${platfdir}/small_platform_constant.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' diff --git a/teshsuite/msg/app-token-ring/app-token-ring.tesh b/teshsuite/msg/app-token-ring/app-token-ring.tesh index 00c488ed4b..47f5abf360 100644 --- a/teshsuite/msg/app-token-ring/app-token-ring.tesh +++ b/teshsuite/msg/app-token-ring/app-token-ring.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of hosts '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" @@ -16,7 +16,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${platfdir}/routing_cluster.xml "-- > [ 0.131796] (1:0@host1) Host "0" received "Token" > [ 0.131796] (0:maestro@) Simulation time 0.131796 -$ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of hosts '2' > [ 0.000000] (1:0@100030591) Host "0" send 'Token' to Host "1" > [ 0.624423] (2:1@100036570) Host "1" received "Token" @@ -24,7 +24,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${platfdir}/two_peers.xml "--log=ro > [ 1.248846] (1:0@100030591) Host "0" received "Token" > [ 1.248846] (0:maestro@) Simulation time 1.24885 -$ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of hosts '60' > [ 0.000000] (1:0@host-1.cluster1) Host "0" send 'Token' to Host "1" > [ 0.030364] (2:1@host-1.cluster2) Host "1" received "Token" diff --git a/teshsuite/msg/async-wait/async-wait.tesh b/teshsuite/msg/async-wait/async-wait.tesh index 322ad38f27..daab871da6 100644 --- a/teshsuite/msg/async-wait/async-wait.tesh +++ b/teshsuite/msg/async-wait/async-wait.tesh @@ -2,7 +2,7 @@ p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver -$ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 1.000000] (2:receiver@Ruby) Wait to receive a task @@ -29,7 +29,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.x p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver -$ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 @@ -56,7 +56,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.x p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver -$ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 1.000000] (2:receiver@Ruby) Wait to receive a task @@ -84,7 +84,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.x p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver -$ $SG_TEST_EXENV ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 diff --git a/teshsuite/msg/async-waitall/async-waitall.tesh b/teshsuite/msg/async-waitall/async-waitall.tesh index 717ac312f6..b815ef30b2 100644 --- a/teshsuite/msg/async-waitall/async-waitall.tesh +++ b/teshsuite/msg/async-waitall/async-waitall.tesh @@ -2,7 +2,7 @@ p Test1 MSG_comm_waitall() for sender ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/async-waitall ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/async-waitall ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_2 diff --git a/teshsuite/msg/async-waitany/async-waitany.tesh b/teshsuite/msg/async-waitany/async-waitany.tesh index 821c1d7302..4027e42175 100644 --- a/teshsuite/msg/async-waitany/async-waitany.tesh +++ b/teshsuite/msg/async-waitany/async-waitany.tesh @@ -3,7 +3,7 @@ p Testing the MSG_comm_waitany function ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/async-waitany ${platfdir:=.}/small_platform.xml ${srcdir:=.}/async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/async-waitany ${platfdir:=.}/small_platform.xml ${srcdir:=.}/async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 comm_size 1000000.000000 > [ 0.000000] (1:sender@Tremblay) Send to receiver-1 Task_1 comm_size 1000000.000000 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_2 comm_size 1000000.000000 diff --git a/teshsuite/msg/cloud-capping/cloud-capping.tesh b/teshsuite/msg/cloud-capping/cloud-capping.tesh index 0bd4127549..b30353d115 100644 --- a/teshsuite/msg/cloud-capping/cloud-capping.tesh +++ b/teshsuite/msg/cloud-capping/cloud-capping.tesh @@ -1,4 +1,4 @@ -$ $SG_TEST_EXENV ${bindir:=.}/cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) # 1. Put a single task on a PM. > [ 0.000000] (1:master_@Fafard) ### Test: with/without MSG_task_set_bound > [ 0.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard diff --git a/teshsuite/msg/cloud-migration/cloud-migration.tesh b/teshsuite/msg/cloud-migration/cloud-migration.tesh index 124b61a9c7..fce982f8c3 100644 --- a/teshsuite/msg/cloud-migration/cloud-migration.tesh +++ b/teshsuite/msg/cloud-migration/cloud-migration.tesh @@ -1,4 +1,4 @@ -$ $SG_TEST_EXENV ${bindir:=.}/cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Test: Migrate a VM with 1000 Mbytes RAM > [132.765801] (1:master_@Fafard) VM0 migrated: Fafard->Tremblay in 132.766 s > [132.765801] (1:master_@Fafard) Test: Migrate a VM with 100 Mbytes RAM diff --git a/teshsuite/msg/cloud-simple/cloud-simple.tesh b/teshsuite/msg/cloud-simple/cloud-simple.tesh index 795fb86793..b54216602d 100644 --- a/teshsuite/msg/cloud-simple/cloud-simple.tesh +++ b/teshsuite/msg/cloud-simple/cloud-simple.tesh @@ -2,7 +2,7 @@ p Testing a vm with two successive tasks -$ $SG_TEST_EXENV ${bindir:=.}/cloud-simple$EXEEXT --log=no_loc ${platfdir}/small_platform.xml +$ ${bindir:=.}/cloud-simple --log=no_loc ${platfdir}/small_platform.xml > [Fafard:master_:(1) 0.000000] [msg_test/INFO] ## Test 1 (started): check computation on normal PMs > [Fafard:master_:(1) 0.000000] [msg_test/INFO] ### Put a task on a PM > [Fafard:compute:(2) 0.013107] [msg_test/INFO] Fafard:compute task executed 0.0131068 diff --git a/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh b/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh index c99a8a6508..160b321206 100644 --- a/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh +++ b/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh @@ -2,7 +2,7 @@ p Testing a vm with two successive tasks -$ $SG_TEST_EXENV ${bindir:=.}/cloud-two-tasks$EXEEXT ${platfdir}/small_platform.xml +$ ${bindir:=.}/cloud-two-tasks ${platfdir}/small_platform.xml > [VM0:compute:(2) 0.000000] [msg_test/INFO] VM0:compute task 1 created 0 > [Fafard:master_:(1) 0.000000] [msg_test/INFO] aTask remaining duration: 1e+09 > [Fafard:master_:(1) 1.000000] [msg_test/INFO] aTask remaining duration: 9.23704e+08 diff --git a/teshsuite/msg/energy-consumption/energy-consumption.tesh b/teshsuite/msg/energy-consumption/energy-consumption.tesh index bcb9f7f012..439de73f24 100644 --- a/teshsuite/msg/energy-consumption/energy-consumption.tesh +++ b/teshsuite/msg/energy-consumption/energy-consumption.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption -$ ${bindir:=.}/energy-consumption$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/energy-consumption ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds @@ -22,7 +22,7 @@ $ ${bindir:=.}/energy-consumption$EXEEXT ${platfdir}/energy_platform.xml "--log= > [ 30.000000] (0:maestro@) Energy consumption of host MyHost2: 2100.000000 Joules > [ 30.000000] (0:maestro@) Energy consumption of host MyHost3: 3000.000000 Joules -$ ${bindir:=.}/energy-consumption$EXEEXT ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/energy-consumption ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 diff --git a/teshsuite/msg/energy-pstate/energy-pstate.tesh b/teshsuite/msg/energy-pstate/energy-pstate.tesh index 7d47505640..464869ffd9 100644 --- a/teshsuite/msg/energy-pstate/energy-pstate.tesh +++ b/teshsuite/msg/energy-pstate/energy-pstate.tesh @@ -2,7 +2,7 @@ p Testing the DVFS-related functions -$ ${bindir:=.}/energy-pstate$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/energy-pstate ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -21,7 +21,7 @@ $ ${bindir:=.}/energy-pstate$EXEEXT ${platfdir}/energy_platform.xml "--log=root. > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 -$ ${bindir:=.}/energy-pstate$EXEEXT ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/energy-pstate ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 diff --git a/teshsuite/msg/energy-ptask/energy-ptask.tesh b/teshsuite/msg/energy-ptask/energy-ptask.tesh index 6848fdbc97..2ab7b15aa9 100644 --- a/teshsuite/msg/energy-ptask/energy-ptask.tesh +++ b/teshsuite/msg/energy-ptask/energy-ptask.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/energy-ptask$EXEEXT ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/energy-ptask ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:test@MyHost1) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair > [300.000000] (1:test@MyHost1) We can do the same with a timeout of one second enabled. diff --git a/teshsuite/msg/io-file-remote/io-file-remote.tesh b/teshsuite/msg/io-file-remote/io-file-remote.tesh index 7f3119dc20..298dda1464 100644 --- a/teshsuite/msg/io-file-remote/io-file-remote.tesh +++ b/teshsuite/msg/io-file-remote/io-file-remote.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/io-file-remote$EXEEXT ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" +$ ${bindir:=.}/io-file-remote ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" > [ 0.000000] (0@ ) Init: 12/476824 MiB used/free on 'Disk1' > [ 0.000000] (0@ ) Init: 2280/474556 MiB used/free on 'Disk2' > [ 0.000000] (1@alice) Opened file 'c:\Windows\setupact.log' diff --git a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh index aa11c7b7f9..efad2194b9 100644 --- a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh +++ b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir}/io-raw-storage$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/io-raw-storage ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:@denise) *** Storage info on denise *** > [ 0.000000] (1:@denise) Storage name: Disk2, mount name: c: > [ 0.000000] (1:@denise) Storage name: Disk4, mount name: /home diff --git a/teshsuite/msg/platform-properties/platform-properties.tesh b/teshsuite/msg/platform-properties/platform-properties.tesh index 6864d3345a..c5668a48f2 100644 --- a/teshsuite/msg/platform-properties/platform-properties.tesh +++ b/teshsuite/msg/platform-properties/platform-properties.tesh @@ -3,7 +3,7 @@ p Testing a MSG application with properties in the XML for Hosts, Links and Processes ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/platform-properties$EXEEXT ${platfdir}/prop.xml ${srcdir:=.}/platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/platform-properties ${platfdir}/prop.xml ${srcdir:=.}/platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s diff --git a/teshsuite/msg/plugin-hostload/plugin-hostload.tesh b/teshsuite/msg/plugin-hostload/plugin-hostload.tesh index 0cb5cfab4c..1f8df839b3 100644 --- a/teshsuite/msg/plugin-hostload/plugin-hostload.tesh +++ b/teshsuite/msg/plugin-hostload/plugin-hostload.tesh @@ -2,7 +2,7 @@ p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops) -$ ${bindir:=.}/plugin-hostload$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/plugin-hostload ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0) > [ 0.000000] (1:load_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed) diff --git a/teshsuite/msg/process-daemon/process-daemon.tesh b/teshsuite/msg/process-daemon/process-daemon.tesh index 226fbdf12a..1808baa77e 100644 --- a/teshsuite/msg/process-daemon/process-daemon.tesh +++ b/teshsuite/msg/process-daemon/process-daemon.tesh @@ -2,7 +2,7 @@ p Testing the process daemonization feature of MSG -$ $SG_TEST_EXENV ${bindir:=.}/process-daemon ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-daemon ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:worker@Boivin) Let's do some work (for 10 sec on Boivin). > [ 0.000000] (2:daemon@Tremblay) Hello from the infinite loop > [ 3.000000] (2:daemon@Tremblay) Hello from the infinite loop diff --git a/teshsuite/msg/process-join/process-join.tesh b/teshsuite/msg/process-join/process-join.tesh index 3a33646630..19e04eaed2 100644 --- a/teshsuite/msg/process-join/process-join.tesh +++ b/teshsuite/msg/process-join/process-join.tesh @@ -1,5 +1,5 @@ -$ $SG_TEST_EXENV ${bindir:=.}/process-join$EXEEXT ${platfdir}/small_platform.xml +$ ${bindir:=.}/process-join ${platfdir}/small_platform.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Start slave > [Tremblay:slave from master:(2) 0.000000] [msg_test/INFO] Slave started > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Join the slave (timeout 2) diff --git a/teshsuite/msg/process-kill/process-kill.tesh b/teshsuite/msg/process-kill/process-kill.tesh index f20a32d9dc..fa1dc2d73a 100644 --- a/teshsuite/msg/process-kill/process-kill.tesh +++ b/teshsuite/msg/process-kill/process-kill.tesh @@ -2,7 +2,7 @@ p Testing a MSG_process_kill function -$ $SG_TEST_EXENV ${bindir:=.}/process-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:killer@Tremblay) Hello! > [ 0.000000] (2:victim@Fafard) Hello! > [ 0.000000] (2:victim@Fafard) Suspending myself diff --git a/teshsuite/msg/process-lifetime/process-lifetime.tesh b/teshsuite/msg/process-lifetime/process-lifetime.tesh index 4d3c96b899..8f102839d9 100644 --- a/teshsuite/msg/process-lifetime/process-lifetime.tesh +++ b/teshsuite/msg/process-lifetime/process-lifetime.tesh @@ -2,7 +2,7 @@ p Test0 Process without time -$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/baseline_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/baseline_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 10.000000] (1:sleeper@node-0.simgrid.org) Done sleeping. > [ 10.000000] (1:sleeper@node-0.simgrid.org) Exiting now (done sleeping or got killed). @@ -10,7 +10,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml p Test1 Process with start time -$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 1.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-2.simgrid.org) Hello! I go to sleep. @@ -34,7 +34,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml p Test1 Process with kill time ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 0.000000] (2:sleeper@node-2.simgrid.org) Hello! I go to sleep. > [ 0.000000] (3:sleeper@node-3.simgrid.org) Hello! I go to sleep. @@ -47,7 +47,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml p Test2 Process with start and kill times ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 1.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-2.simgrid.org) Hello! I go to sleep. diff --git a/teshsuite/msg/process-migration/process-migration.tesh b/teshsuite/msg/process-migration/process-migration.tesh index 05e95a2866..8b1530e6f0 100644 --- a/teshsuite/msg/process-migration/process-migration.tesh +++ b/teshsuite/msg/process-migration/process-migration.tesh @@ -3,7 +3,7 @@ p Testing the migration feature of MSG ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/process-migration ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-migration ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:emigrant@Jacquelin) I'll look for a new job on another machine ('Boivin') where the grass is greener. > [ 0.000000] (1:emigrant@Boivin) Yeah, found something to do > [ 0.000000] (2:policeman@Boivin) Wait at the checkpoint. diff --git a/teshsuite/msg/process-suspend/process-suspend.tesh b/teshsuite/msg/process-suspend/process-suspend.tesh index a7f41fce5b..172df6c3da 100644 --- a/teshsuite/msg/process-suspend/process-suspend.tesh +++ b/teshsuite/msg/process-suspend/process-suspend.tesh @@ -3,7 +3,7 @@ p Testing the suspend/resume feature of MSG ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/process-suspend ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-suspend ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dream_master@Boivin) Let's create a lazy guy. > [ 0.000000] (2:Lazy@Boivin) Nobody's watching me ? Let's go to sleep. > [ 0.000000] (1:dream_master@Boivin) Let's wait a little bit... diff --git a/teshsuite/msg/process-yield/process-yield.tesh b/teshsuite/msg/process-yield/process-yield.tesh index 458bfedf7f..897e61ae97 100644 --- a/teshsuite/msg/process-yield/process-yield.tesh +++ b/teshsuite/msg/process-yield/process-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/process-yield ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/process-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/process-yield ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/process-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now! > [ 0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now! diff --git a/teshsuite/msg/task-priority/task-priority.tesh b/teshsuite/msg/task-priority/task-priority.tesh index 19886bd832..8af98f9e3a 100644 --- a/teshsuite/msg/task-priority/task-priority.tesh +++ b/teshsuite/msg/task-priority/task-priority.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/task-priority$EXEEXT ${platfdir}/small_platform.xml ${srcdir:=.}/task-priority_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/task-priority ${platfdir}/small_platform.xml ${srcdir:=.}/task-priority_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 1 > [ 0.000000] (2:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 2 > [ 1.500000] (2:test@Fafard) Goodbye now! diff --git a/teshsuite/s4u/actor-migration/actor-migration.tesh b/teshsuite/s4u/actor-migration/actor-migration.tesh index c3c3790302..2dcf6e536b 100644 --- a/teshsuite/s4u/actor-migration/actor-migration.tesh +++ b/teshsuite/s4u/actor-migration/actor-migration.tesh @@ -3,7 +3,7 @@ p Testing the migration feature of S4U ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/actor-migration ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/actor-migration ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:emigrant@Jacquelin) I'll look for a new job on another machine ('Boivin') where the grass is greener. > [ 0.000000] (1:emigrant@Boivin) Yeah, found something to do > [ 0.000000] (2:policeman@Boivin) Wait at the checkpoint. diff --git a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh index fe95a5b023..235dfcf2cb 100644 --- a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh +++ b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh @@ -1,4 +1,4 @@ -$ $SG_TEST_EXENV ${bindir:=.}/cloud-interrupt-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/cloud-interrupt-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Start the migration of VM0 from Fafard to Tremblay > [ 2.000000] (1:master_@Fafard) Wait! change my mind, shutdown VM0. This ends the migration > [ 10.000000] (1:master_@Fafard) Start again the migration of VM0 from Fafard to Tremblay diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh index f12ea29ca8..89994b3073 100644 --- a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh +++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh @@ -1,4 +1,4 @@ -$ ./concurrent_rw$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ./concurrent_rw ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (host@bob) process 1 is writing! > [ 0.000000] (host@bob) process 2 is writing! > [ 0.000000] (host@bob) process 3 is writing! diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.tesh b/teshsuite/s4u/storage_client_server/storage_client_server.tesh index 14fe8b0cc6..6d097a8fb0 100644 --- a/teshsuite/s4u/storage_client_server/storage_client_server.tesh +++ b/teshsuite/s4u/storage_client_server/storage_client_server.tesh @@ -1,4 +1,4 @@ -$ ./storage_client_server$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ./storage_client_server ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (server@alice) *** Storage info on alice *** > [ 0.000000] (server@alice) Storage name: Disk2, mount name: c: > [ 0.000000] (server@alice) Free size: 534479374867 bytes diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh index 5bfeacdcf4..90d20da2cd 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -134,7 +134,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -268,7 +268,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -302,7 +302,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.xml "--log=root.fmt > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -320,7 +320,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.xml "--log=root.fmt > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -363,7 +363,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/three_hosts_non_symmetric_route.xml > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -498,7 +498,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[% > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -525,7 +525,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.xml "--log=root > > -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -550,7 +550,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.xml "--log=root. > > -$ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -684,7 +684,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm > > -$ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > diff --git a/teshsuite/surf/lmm_usage/lmm_usage.tesh b/teshsuite/surf/lmm_usage/lmm_usage.tesh index 2a98cd44c3..d8f68180a8 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.tesh +++ b/teshsuite/surf/lmm_usage/lmm_usage.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/lmm_usage +$ ${bindir:=.}/lmm_usage > [0.000000] [surf_test/INFO] ***** Test 1 (Max-Min) > [0.000000] [surf_test/INFO] ***** Test 1 (Lagrange - Vegas) > [0.000000] [surf_test/INFO] ***** Test 1 (Lagrange - Reno) diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh index dbc5167223..0cd7580c50 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh +++ b/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh @@ -3,7 +3,7 @@ ! timeout 300 ! expect return 0 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench big 1 +$ ${bindir:=.}/maxmin_bench big 1 > Starting 0: (807) > Starting to solve(812) > 1x One shot execution time for a total of 2000 constraints, 2000 variables with 96 active constraint each, concurrency in [32,288] and max concurrency share 2 diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh index 25c131eb36..a7f2d7f979 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh +++ b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh @@ -3,7 +3,7 @@ ! timeout 50 ! expect return 0 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench medium 5 test +$ ${bindir:=.}/maxmin_bench medium 5 test > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 0 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 100 > [0.000000]: [surf_maxmin/DEBUG] Constraint '98' usage: 13.060939 remaining: 3.166833 concurrency: 7<=8<=10 diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh index 40449aafef..9ec6403582 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh +++ b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh @@ -3,7 +3,7 @@ ! timeout 10 ! expect return 0 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench small 10 test +$ ${bindir:=.}/maxmin_bench small 10 test > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 0 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 10 > [0.000000]: [surf_maxmin/DEBUG] Constraint '9' usage: 4.703796 remaining: 7.082917 concurrency: 2<=2<=-1 diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh index 1dbf13b8a8..29fbac9f4a 100644 --- a/teshsuite/surf/surf_usage/surf_usage.tesh +++ b/teshsuite/surf/surf_usage/surf_usage.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/surf_usage ${platfdir}/two_hosts_profiles.xml +$ ${bindir:=.}/surf_usage ${platfdir}/two_hosts_profiles.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02' > [0.000000] [surf_test/INFO] actionA state: SURF_ACTION_RUNNING diff --git a/teshsuite/surf/surf_usage2/surf_usage2.tesh b/teshsuite/surf/surf_usage2/surf_usage2.tesh index eb98a91ad9..935bb535ee 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.tesh +++ b/teshsuite/surf/surf_usage2/surf_usage2.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/surf_usage2 ${platfdir}/two_hosts_profiles.xml +$ ${bindir:=.}/surf_usage2 ${platfdir}/two_hosts_profiles.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.200000] [surf_test/INFO] Next Event : 0.2 diff --git a/teshsuite/xbt/log_usage/log_usage.tesh b/teshsuite/xbt/log_usage/log_usage.tesh index 3d96f663c3..4db584b41e 100644 --- a/teshsuite/xbt/log_usage/log_usage.tesh +++ b/teshsuite/xbt/log_usage/log_usage.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Check different log thresholds -$ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 > [ 0.000000] [0:maestro@] false alarm! @@ -22,7 +22,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m > [ 0.000000] [0:maestro@] false alarm! p Check the "file" log appender -$ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:file:${bindir:=.}/log_usage.log +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:file:${bindir:=.}/log_usage.log $ cat ${bindir:=.}/log_usage.log > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 @@ -44,7 +44,7 @@ $ cat ${bindir:=.}/log_usage.log > [ 0.000000] [0:maestro@] false alarm! p Check the "rollfile" log appender -$ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:rollfile:500:${bindir:=.}/log_usage.log +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:rollfile:500:${bindir:=.}/log_usage.log $ cat ${bindir:=.}/log_usage.log > [ 0.000000] [0:maestro@] val=2 > [ 0.000000] [0:maestro@] false alarm! @@ -63,7 +63,7 @@ $ cat ${bindir:=.}/log_usage.log > p Check the "splitfile" log appender -$ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:splitfile:500:${bindir:=.}/log_usage_%.log +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:splitfile:500:${bindir:=.}/log_usage_%.log $ cat ${bindir:=.}/log_usage_0.log > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 diff --git a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh index c9f7f1e474..113c106e98 100644 --- a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh +++ b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 > [ 0.000000] [0:maestro@] false alarm! diff --git a/teshsuite/xbt/parmap_bench/parmap_bench.tesh b/teshsuite/xbt/parmap_bench/parmap_bench.tesh index bc95e835b6..58b392bfc8 100644 --- a/teshsuite/xbt/parmap_bench/parmap_bench.tesh +++ b/teshsuite/xbt/parmap_bench/parmap_bench.tesh @@ -1,3 +1,3 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV ${bindir:=.}/parmap_bench 4 0.25 --log=parmap_bench.thres:warning +$ ${bindir:=.}/parmap_bench 4 0.25 --log=parmap_bench.thres:warning diff --git a/tools/cmake/scripts/update_tesh.pl b/tools/cmake/scripts/update_tesh.pl index b99c787b0d..8a8d26baa1 100755 --- a/tools/cmake/scripts/update_tesh.pl +++ b/tools/cmake/scripts/update_tesh.pl @@ -33,8 +33,6 @@ while(defined($line=)) $line =~ s/\$\{srcdir\:\=\.\}/./g; $line =~ s/\(/\\(/g; $line =~ s/\)/\\)/g; - $line =~ s/\$SG_TEST_EXENV//g; - $line =~ s/\$EXEEXT//g; $line =~ s/^\$\ */.\//g; $line =~ s/^.\/lua/lua/g; $line =~ s/^.\/ruby/ruby/g; -- 2.20.1