From: Frederic Suter Date: Tue, 26 Apr 2016 11:34:55 +0000 (+0200) Subject: renaming a bunch of tests X-Git-Tag: v3_13~32 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd21c63b5d738956b1eeaca9ca904b721301e4af renaming a bunch of tests --- diff --git a/.gitignore b/.gitignore index 84fa2b2948..96971ad6f3 100644 --- a/.gitignore +++ b/.gitignore @@ -141,7 +141,7 @@ examples/msg/io-file/io-file examples/msg/io-file-unlink/io-file-unlink examples/msg/io-remote/io-remote examples/msg/io-storage/io-storage -examples/msg/failures/failures +examples/msg/platform-failures/platform-failures examples/msg/process-kill/process-kill examples/msg/app-masterworker/app-masterworker examples/msg/mc/bugged1 @@ -165,10 +165,10 @@ examples/msg/network-ns3/network-ns3 examples/msg/app-pmm/app-pmm examples/msg/task-priority/task-priority examples/msg/procmig.trace -examples/msg/properties/properties -examples/msg/synchro/synchro +examples/msg/platform-properties/platform-properties +examples/msg/synchro-semaphore/synchro-semaphore examples/msg/app-pingpong/app-pingpong -examples/msg/set-maestro/set-maestro +examples/msg/maestro-set/maestro-set examples/msg/simulation.trace examples/msg/process-startkilltime/process-startkilltime examples/msg/process-suspend/process-suspend diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index f56e9d1388..4b7ef756a6 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -1,8 +1,8 @@ foreach(x actions-comm actions-storage app-masterworker app-pingpong app-pmm app-token-ring async-wait async-waitall async-waitany cloud-capping cloud-masterworker cloud-migration cloud-multicore cloud-simple cloud-two-tasks - dht-chord dht-pastry energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures + dht-chord dht-pastry energy-consumption energy-onoff energy-pstate energy-ptask energy-vm platform-failures io-file io-remote io-storage task-priority process-kill process-migration process-suspend - platform-properties set-maestro process-startkilltime synchro trace-categories + platform-properties maestro-set process-startkilltime synchro-semaphore trace-categories trace-link-srcdst-user-variables trace-link-user-variables trace-masterworker trace-platform trace-process-migration trace-simple trace-user-variables) add_executable (${x} ${x}/${x}.c) @@ -40,7 +40,8 @@ foreach (file answer dht-kademlia node routing_table task) endforeach() foreach (file actions-comm actions-storage app-bittorrent app-chainsend app-masterworker app-pingpong async-wait - async-waitall async-waitany dht-chord dht-kademlia dht-pastry io-remote properties set-maestro task-priority) + async-waitall async-waitany dht-chord dht-kademlia dht-pastry io-remote platform-properties maestro-set + task-priority) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml) endforeach() @@ -83,8 +84,8 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/actio foreach(x actions-comm actions-storage app-bittorrent app-chainsend app-masterworker app-pingpong app-token-ring async-wait async-waitall async-waitany cloud-capping cloud-masterworker cloud-migration cloud-simple - cloud-two-tasks dht-chord dht-kademlia failures io-file io-remote io-storage task-priority - process-kill process-migration process-suspend platform-properties synchro process-startkilltime) + cloud-two-tasks dht-chord dht-kademlia platform-failures io-file io-remote io-storage task-priority + process-kill process-migration process-suspend platform-properties synchro-semaphore process-startkilltime) ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh) endforeach() @@ -102,7 +103,7 @@ ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread;ucontext;raw" --c ADD_TESH_FACTORIES(msg-energy-pstate-ptask "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh) ADD_TESH_FACTORIES(msg-energy-consumption-ptask "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh) ADD_TESH_FACTORIES(msg-energy-ptask "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh) -ADD_TESH_FACTORIES(msg-set-maestro "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/set-maestro/set-maestro.tesh) +ADD_TESH_FACTORIES(msg-maestro-set "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/maestro-set/maestro-set.tesh) ADD_TESH_FACTORIES(app-masterworker-multicore "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-multicore.tesh) ADD_TESH_FACTORIES(app-masterworker-vivaldi "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh) diff --git a/examples/msg/set-maestro/set-maestro.c b/examples/msg/maestro-set/maestro-set.c similarity index 100% rename from examples/msg/set-maestro/set-maestro.c rename to examples/msg/maestro-set/maestro-set.c diff --git a/examples/msg/set-maestro/set-maestro.tesh b/examples/msg/maestro-set/maestro-set.tesh similarity index 79% rename from examples/msg/set-maestro/set-maestro.tesh rename to examples/msg/maestro-set/maestro-set.tesh index 538a8c47c5..08ab8262e8 100644 --- a/examples/msg/set-maestro/set-maestro.tesh +++ b/examples/msg/maestro-set/maestro-set.tesh @@ -1,6 +1,6 @@ #! ./tesh -! output sort 19 $ $SG_TEST_EXENV set-maestro/set-maestro$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/set-maestro/set-maestro_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +! output sort 19 $ $SG_TEST_EXENV maestro-set/maestro-set$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/maestro-set/maestro-set_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sender > [ 0.000000] (1:sender@Tremblay) host = Jupiter > [ 0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00 diff --git a/examples/msg/set-maestro/set-maestro_d.xml b/examples/msg/maestro-set/maestro-set_d.xml similarity index 100% rename from examples/msg/set-maestro/set-maestro_d.xml rename to examples/msg/maestro-set/maestro-set_d.xml diff --git a/examples/msg/failures/failures.c b/examples/msg/platform-failures/platform-failures.c similarity index 100% rename from examples/msg/failures/failures.c rename to examples/msg/platform-failures/platform-failures.c diff --git a/examples/msg/failures/failures.tesh b/examples/msg/platform-failures/platform-failures.tesh similarity index 95% rename from examples/msg/failures/failures.tesh rename to examples/msg/platform-failures/platform-failures.tesh index 70797a18c3..bfa2aa4dec 100644 --- a/examples/msg/failures/failures.tesh +++ b/examples/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:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/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" +$ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/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" > [ 0.000000] (0:maestro@) Cannot launch process 'worker' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.010309] (1:master@Tremblay) Send completed @@ -98,7 +98,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Cannot launch process 'worker' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.010825] (1:master@Tremblay) Send completed @@ -193,7 +193,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log p Testing a simple master/worker example application handling failures. CPU_TI optimization enabled ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/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" +$ $SG_TEST_EXENV ${bindir:=.}/platform-failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/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" > [ 0.000000] (0:maestro@) Cannot launch process 'worker' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.010825] (1:master@Tremblay) Send completed diff --git a/examples/msg/synchro/synchro.c b/examples/msg/synchro-semaphore/synchro-semaphore.c similarity index 100% rename from examples/msg/synchro/synchro.c rename to examples/msg/synchro-semaphore/synchro-semaphore.c diff --git a/examples/msg/synchro/synchro.tesh b/examples/msg/synchro-semaphore/synchro-semaphore.tesh similarity index 92% rename from examples/msg/synchro/synchro.tesh rename to examples/msg/synchro-semaphore/synchro-semaphore.tesh index cf187fe8bd..8f4afb0930 100644 --- a/examples/msg/synchro/synchro.tesh +++ b/examples/msg/synchro-semaphore/synchro-semaphore.tesh @@ -3,7 +3,7 @@ p Testing synchronization with semaphores ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/synchro ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/synchro-semaphore ${srcdir:=.}/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