3 more renamed tests

diff --git a/.gitignore b/.gitignore
index 13bbc3d..9bd399f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -161,8 +161,8 @@ examples/msg/mc/test/snapshot_comparison4
 examples/msg/mc/test/snapshot_comparison5
 examples/msg/process-migration/process-migration
 examples/msg/ms.trace
 examples/msg/mc/test/snapshot_comparison5
 examples/msg/process-migration/process-migration
 examples/msg/ms.trace

-examples/msg/ns3/ns3
-examples/msg/pmm/pmm
+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/task-priority/task-priority
 examples/msg/procmig.trace
 examples/msg/properties/properties


@@ -172,8 +172,7 @@ examples/msg/set-maestro/set-maestro
 examples/msg/simulation.trace
 examples/msg/process-startkilltime/process-startkilltime
 examples/msg/process-suspend/process-suspend
 examples/msg/simulation.trace
 examples/msg/process-startkilltime/process-startkilltime
 examples/msg/process-suspend/process-suspend

-examples/msg/token_ring/token_ring
-examples/msg/trace/test_trace_integration
+examples/msg/app-token-ring/app-token-ring

 examples/msg/trace-categories/trace-categories
 examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
 examples/msg/trace-link-user-variables/trace-link-user-variables
 examples/msg/trace-categories/trace-categories
 examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
 examples/msg/trace-link-user-variables/trace-link-user-variables

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index ddd1162..6b7f617 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,8 +1,8 @@
-foreach(x actions-comm actions-storage app-masterworker async-wait async-waitall async-waitany cloud-capping
-          cloud-masterworker cloud-migration cloud-multicore cloud-simple cloud-two-tasks dht-chord 
+foreach(x actions-comm actions-storage app-masterworker 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 exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file 
           dht-pastry exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file 

-          io-file-unlink io-remote io-storage pmm task-priority process-kill process-migration process-suspend 
-          properties sendrecv set-maestro process-startkilltime synchro token_ring trace-categories 
+          io-file-unlink io-remote io-storage task-priority process-kill process-migration process-suspend 
+          properties sendrecv set-maestro process-startkilltime synchro 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)
           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)


@@ -13,9 +13,9 @@ foreach(x actions-comm actions-storage app-masterworker async-wait async-waitall
 endforeach()
 
 if(HAVE_NS3)
 endforeach()
 
 if(HAVE_NS3)

-  add_executable       (ns3 ns3/ns3.c)
-  target_link_libraries(ns3 simgrid)
-  set_target_properties(ns3  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ns3)
+  add_executable       (network-ns3 network-ns3/network-ns3.c)
+  target_link_libraries(network-ns3 simgrid)
+  set_target_properties(network-ns3  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3)

 endif()
 
 add_executable       (bittorrent app-bittorrent/bittorrent.c app-bittorrent/messages.c app-bittorrent/peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)
 endif()
 
 add_executable       (bittorrent app-bittorrent/bittorrent.c app-bittorrent/messages.c app-bittorrent/peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)


@@ -54,13 +54,13 @@ set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/gen
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py                     PARENT_SCOPE)
 set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/chainsend.c
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/common.h
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py                     PARENT_SCOPE)
 set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/chainsend.c
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/common.h

-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.c                                    PARENT_SCOPE)
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/network-ns3.c                    PARENT_SCOPE)

 set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/app-bittorrent.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/app-chainsend.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi.tesh
 set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/app-bittorrent.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/app-chainsend.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi.tesh

-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.tesh                                 PARENT_SCOPE)
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/network-ns3.tesh                 PARENT_SCOPE)

 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/actions-comm_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi_d.xml
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/actions-comm_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi_d.xml


@@ -68,23 +68,23 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/actio
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait3_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait3_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml

-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3hosts_2links_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links-timer_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/crosstraffic_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/dogbone_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/onelink_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/one_cluster_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/two_clusters_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3hosts_2links_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3links-timer_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3links_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/crosstraffic_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/dogbone_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/onelink_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/one_cluster_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/two_clusters_d.xml

                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/baseline_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/kill_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_kill_d.xml       PARENT_SCOPE)
 
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/baseline_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/kill_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_kill_d.xml       PARENT_SCOPE)
 

-foreach(x actions-comm actions-storage app-bittorrent app-chainsend app-masterworker async-wait async-waitall
-          async-waitany cloud-capping cloud-masterworker cloud-migration cloud-simple cloud-two-tasks 
+foreach(x actions-comm actions-storage app-bittorrent app-chainsend app-masterworker 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-file-unlink io-remote io-storage task-priority process-kill
           dht-chord dht-kademlia failures io-file io-file-unlink io-remote io-storage task-priority process-kill

-          process-migration process-suspend properties sendrecv synchro process-startkilltime token_ring)
+          process-migration process-suspend properties sendrecv synchro 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()
 
   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()
 


@@ -107,10 +107,10 @@ ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=
 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)
 
 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)
 

-ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
+ADD_TESH(msg-app-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/app-pmm/app-pmm.tesh)

 
 if(HAVE_NS3)
 
 if(HAVE_NS3)

-  ADD_TESH_FACTORIES(msg-ns3 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+  ADD_TESH_FACTORIES(msg-network-ns3 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/network-ns3/network-ns3.tesh)

 endif()
 
 # These one are not usable:
 endif()
 
 # These one are not usable:

diff --git a/examples/msg/pmm/pmm.c b/examples/msg/app-pmm/app-pmm.c
similarity index 100%
rename from examples/msg/pmm/pmm.c
rename to examples/msg/app-pmm/app-pmm.c

diff --git a/examples/msg/pmm/pmm.tesh b/examples/msg/app-pmm/app-pmm.tesh
similarity index 98%
rename from examples/msg/pmm/pmm.tesh
rename to examples/msg/app-pmm/app-pmm.tesh
index a7798be..5d37f1d 100644 (file)
--- a/examples/msg/pmm/pmm.tesh
+++ b/examples/msg/app-pmm/app-pmm.tesh
@@ -3,7 +3,7 @@
 p Testing the Parallel Matrix Multiplication 
 
 ! timeout 120
 p Testing the Parallel Matrix Multiplication 
 
 ! timeout 120

-$ ./pmm/pmm --log=msg_pmm.thres:verbose --log=no_loc ${srcdir:=.}/../platforms/cluster.xml
+$ ./app-pmm/app-pmm --log=msg_pmm.thres:verbose --log=no_loc ${srcdir:=.}/../platforms/cluster.xml

 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 0
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 1
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 2
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 0
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 1
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 2

diff --git a/examples/msg/token_ring/token_ring.c b/examples/msg/app-token-ring/app-token-ring.c
similarity index 100%
rename from examples/msg/token_ring/token_ring.c
rename to examples/msg/app-token-ring/app-token-ring.c

diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/app-token-ring/app-token-ring.tesh
similarity index 96%
rename from examples/msg/token_ring/token_ring.tesh
rename to examples/msg/app-token-ring/app-token-ring.tesh
index 09fe3ed..086637c 100644 (file)
--- a/examples/msg/token_ring/token_ring.tesh
+++ b/examples/msg/app-token-ring/app-token-ring.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${srcdir:=.}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Number of host '6'
 > [  0.000000] (1:0@host1) Host "0" send 'Token' to Host "1"
 > [  0.017354] (2:1@host2) Host "1" received "Token"
 > [  0.000000] (0:maestro@) Number of host '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:=.}/token_ring ${srcdir:=.}/routing_cluster.xml "--log
 > [  0.131796] (1:0@host1) Host "0" received "Token"
 > [  0.131796] (0:maestro@) Simulation time 0.131796
 
 > [  0.131796] (1:0@host1) Host "0" received "Token"
 > [  0.131796] (0:maestro@) Simulation time 0.131796
 

-$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${srcdir:=.}/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"

 > [    0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes'
 > [    0.000000] (0:maestro@) Number of host '2'
 > [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
 > [    0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes'
 > [    0.000000] (0:maestro@) Number of host '2'
 > [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"


@@ -25,7 +25,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=networ
 > [    1.275820] (1:0@peer_100030591) Host "0" received "Token"
 > [    1.275820] (0:maestro@) Simulation time 1.27582
 
 > [    1.275820] (1:0@peer_100030591) Host "0" received "Token"
 > [    1.275820] (0:maestro@) Simulation time 1.27582
 

-$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${srcdir:=.}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Number of host '60'
 > [  0.000000] (1:0@host-2.cluster1) Host "0" send 'Token' to Host "1"
 > [  0.030364] (2:1@host-2.cluster2) Host "1" received "Token"
 > [  0.000000] (0:maestro@) Number of host '60'
 > [  0.000000] (1:0@host-2.cluster1) Host "0" send 'Token' to Host "1"
 > [  0.030364] (2:1@host-2.cluster2) Host "1" received "Token"

diff --git a/examples/msg/ns3/3hosts_2links_d.xml b/examples/msg/network-ns3/3hosts_2links_d.xml
similarity index 100%
rename from examples/msg/ns3/3hosts_2links_d.xml
rename to examples/msg/network-ns3/3hosts_2links_d.xml

diff --git a/examples/msg/ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml
similarity index 100%
rename from examples/msg/ns3/3links-timer_d.xml
rename to examples/msg/network-ns3/3links-timer_d.xml

diff --git a/examples/msg/ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml
similarity index 100%
rename from examples/msg/ns3/3links_d.xml
rename to examples/msg/network-ns3/3links_d.xml

diff --git a/examples/msg/ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml
similarity index 100%
rename from examples/msg/ns3/crosstraffic_d.xml
rename to examples/msg/network-ns3/crosstraffic_d.xml

diff --git a/examples/msg/ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml
similarity index 100%
rename from examples/msg/ns3/dogbone_d.xml
rename to examples/msg/network-ns3/dogbone_d.xml

diff --git a/examples/msg/ns3/ns3.c b/examples/msg/network-ns3/network-ns3.c
similarity index 100%
rename from examples/msg/ns3/ns3.c
rename to examples/msg/network-ns3/network-ns3.c

diff --git a/examples/msg/ns3/ns3.tesh b/examples/msg/network-ns3/network-ns3.tesh
similarity index 57%
rename from examples/msg/ns3/ns3.tesh
rename to examples/msg/network-ns3/network-ns3.tesh
index 543df81..33a67e0 100644 (file)
--- a/examples/msg/ns3/ns3.tesh
+++ b/examples/msg/network-ns3/network-ns3.tesh
@@ -5,19 +5,19 @@ p We just want to check that the NS3 bindings of SimGrid are working correctly,
 
 p 3hosts 2links
 
 
 p 3hosts 2links
 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3hosts_2links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/network-ns3/3hosts_2links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from Tremblay to Jupiter
 
 p 6hosts 3links
 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from Tremblay to Jupiter
 
 p 6hosts 3links
 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/network-ns3/3links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
 > [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
 > [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links-timer_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/network-ns3/3links-timer_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
 > [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette


@@ -26,34 +26,34 @@ $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${s
 
 p One cluster
 
 
 p One cluster
 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/one_cluster_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/network-ns3/one_cluster_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-6.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org
 
 p Two clusters
 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-6.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org
 
 p Two clusters
 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/two_clusters_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/network-ns3/two_clusters_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-16.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to node-16.acme.org
 
 p Dogbone
 
 ! timeout 10
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [node-16.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to node-16.acme.org
 
 p Dogbone
 
 ! timeout 10

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/dogbone.xml ${srcdir:=.}/examples/msg/ns3/dogbone_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/dogbone.xml ${srcdir:=.}/examples/msg/network-ns3/dogbone_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [C1:worker(3)] [msg_test/INFO] FLOW[0] : Receive 20000000 bytes from S1 to C1
 > [C2:worker(4)] [msg_test/INFO] FLOW[1] : Receive 20000000 bytes from S2 to C2
 
 p 2hosts 1link
 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [C1:worker(3)] [msg_test/INFO] FLOW[0] : Receive 20000000 bytes from S1 to C1
 > [C2:worker(4)] [msg_test/INFO] FLOW[1] : Receive 20000000 bytes from S2 to C2
 
 p 2hosts 1link
 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/onelink.xml ${srcdir:=.}/examples/msg/ns3/onelink_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/onelink.xml ${srcdir:=.}/examples/msg/network-ns3/onelink_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"

 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
 
 p Crosstraffic TCP option DISABLED
 ! output ignore 
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
 
 p Crosstraffic TCP option DISABLED
 ! output ignore 

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:0 
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/network-ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:0 

 
 p Crosstraffic TCP option ENABLED
 ! output ignore
 
 p Crosstraffic TCP option ENABLED
 ! output ignore

-$ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:1
+$ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/network-ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:1

diff --git a/examples/msg/ns3/one_cluster_d.xml b/examples/msg/network-ns3/one_cluster_d.xml
similarity index 100%
rename from examples/msg/ns3/one_cluster_d.xml
rename to examples/msg/network-ns3/one_cluster_d.xml

diff --git a/examples/msg/ns3/onelink_d.xml b/examples/msg/network-ns3/onelink_d.xml
similarity index 100%
rename from examples/msg/ns3/onelink_d.xml
rename to examples/msg/network-ns3/onelink_d.xml

diff --git a/examples/msg/ns3/two_clusters_d.xml b/examples/msg/network-ns3/two_clusters_d.xml
similarity index 100%
rename from examples/msg/ns3/two_clusters_d.xml
rename to examples/msg/network-ns3/two_clusters_d.xml