From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 16 Mar 2016 21:05:53 +0000 (+0100)
Subject: start to reorganize teshsuite/simdag
X-Git-Tag: v3_13~395
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/576fac0b2f9ff651dfc7454bba89bbf0f76e934d

start to reorganize teshsuite/simdag
---

diff --git a/.gitignore b/.gitignore
index b041b0030b..bdd918888a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -277,7 +277,7 @@ teshsuite/msg/process/process
 teshsuite/msg/storage_client_server/storage_client_server
 teshsuite/msg/task_destroy_cancel/task_destroy_cancel
 teshsuite/msg/trace/test_trace_integration
-teshsuite/simdag/availability/availability_test
+teshsuite/simdag/availability/availability
 teshsuite/simdag/basic/basic0
 teshsuite/simdag/basic/basic1
 teshsuite/simdag/basic/basic2
@@ -286,13 +286,13 @@ teshsuite/simdag/basic/basic4
 teshsuite/simdag/basic/basic5
 teshsuite/simdag/basic/basic6
 teshsuite/simdag/incomplete/incomplete
-teshsuite/simdag/network/mxn/mxn-all2all
-teshsuite/simdag/network/mxn/mxn-independent_comm
-teshsuite/simdag/network/mxn/mxn-scatter
-teshsuite/simdag/network/p2p/p2p-latency1
-teshsuite/simdag/network/p2p/p2p-latency2
-teshsuite/simdag/network/p2p/p2p-latency3
-teshsuite/simdag/network/p2p/p2p-latency_bound
+teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all
+teshsuite/simdag/comm-mxn-independent/comm-mxn-independent
+teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter
+teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1
+teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2
+teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3
+teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound
 teshsuite/simdag/network/test_reinit_costs
 teshsuite/simdag/partask/par-comp_only_par
 teshsuite/simdag/partask/par-comp_only_seq
diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
new file mode 100644
index 0000000000..65cbe86064
--- /dev/null
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -0,0 +1,15 @@
+foreach(x availability comm-mxn-all2all comm-mxn-independent comm-mxn-scatter comm-p2p-latency-1 comm-p2p-latency-2
+          comm-p2p-latency-3 comm-p2p-latency-bound incomplete)
+  add_executable       (${x}  ${x}/${x}.c)
+  target_link_libraries(${x}  simgrid)
+  set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+
+  ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}     PARENT_SCOPE)
+
diff --git a/teshsuite/simdag/availability/CMakeLists.txt b/teshsuite/simdag/availability/CMakeLists.txt
deleted file mode 100644
index 9a971d8999..0000000000
--- a/teshsuite/simdag/availability/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (availability_test availability_test.c)
-target_link_libraries(availability_test simgrid)
-
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.tesh  PARENT_SCOPE)
-set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.c     PARENT_SCOPE)
-
-ADD_TESH(tesh-simdag-availability --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability/availability_test.tesh)
diff --git a/teshsuite/simdag/availability/availability_test.c b/teshsuite/simdag/availability/availability.c
similarity index 100%
rename from teshsuite/simdag/availability/availability_test.c
rename to teshsuite/simdag/availability/availability.c
diff --git a/teshsuite/simdag/availability/availability_test.tesh b/teshsuite/simdag/availability/availability.tesh
similarity index 89%
rename from teshsuite/simdag/availability/availability_test.tesh
rename to teshsuite/simdag/availability/availability.tesh
index 5bf04fb6ff..a9aed3a83a 100644
--- a/teshsuite/simdag/availability/availability_test.tesh
+++ b/teshsuite/simdag/availability/availability.tesh
@@ -1,4 +1,4 @@
-$ simdag/availability/availability_test ${srcdir:=.}/../examples/platforms/simulacrum_7_hosts.xml --cfg=path:${srcdir:=.}/simdag/availability/ ${srcdir:=.}/../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical
+$ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml  ../../../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] Scheduling DAX...
diff --git a/teshsuite/simdag/basic/basic6.tesh b/teshsuite/simdag/basic/basic6.tesh
index 550dd6c8b7..c249b2a098 100644
--- a/teshsuite/simdag/basic/basic6.tesh
+++ b/teshsuite/simdag/basic/basic6.tesh
@@ -1,3 +1,3 @@
-$ ${bindir:=.}/basic6 ../network/p2p/platform_2p_1sl.xml "--log=root.fmt:[%10.6r]%e%m%n"
+$ ${bindir:=.}/basic6 ../platforms/platform_2p_1sl.xml "--log=root.fmt:[%10.6r]%e%m%n"
 > [  0.000000] Switching to the L07 model to handle parallel tasks.
 > [  2.000000] Simulation time: 2.000000
diff --git a/teshsuite/simdag/network/mxn/mxn-all2all.c b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
similarity index 100%
rename from teshsuite/simdag/network/mxn/mxn-all2all.c
rename to teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
diff --git a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh
new file mode 100644
index 0000000000..e73348e388
--- /dev/null
+++ b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh
@@ -0,0 +1,6 @@
+p all 2 all test, only fat pipe switch is used concurrently
+! output sort
+
+$ ${bindir:=.}/comm-mxn-all2all ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 8
diff --git a/teshsuite/simdag/network/mxn/mxn-independent_comm.c b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
similarity index 100%
rename from teshsuite/simdag/network/mxn/mxn-independent_comm.c
rename to teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
diff --git a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh
new file mode 100644
index 0000000000..5a6c3bb826
--- /dev/null
+++ b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh
@@ -0,0 +1,6 @@
+p sending on different paths test
+! output sort
+
+$ ${bindir:=.}/comm-mxn-independent ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 3
diff --git a/teshsuite/simdag/network/mxn/mxn-scatter.c b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
similarity index 100%
rename from teshsuite/simdag/network/mxn/mxn-scatter.c
rename to teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
diff --git a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh
new file mode 100644
index 0000000000..627b9fefb6
--- /dev/null
+++ b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh
@@ -0,0 +1,6 @@
+p scatter test
+! output sort
+
+$ ${bindir:=.}/comm-mxn-scatter ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 8
diff --git a/teshsuite/simdag/network/p2p/p2p-latency1.c b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/p2p-latency1.c
rename to teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c
diff --git a/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh
new file mode 100644
index 0000000000..2c8538b723
--- /dev/null
+++ b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh
@@ -0,0 +1,20 @@
+p latency check, 1 byte, shared link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 1.5
+
+p latency check, 1 byte, fat pipe
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 1.5
+
+p latency check, 1 byte, link - switch - link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 3
diff --git a/teshsuite/simdag/network/p2p/p2p-latency2.c b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/p2p-latency2.c
rename to teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c
diff --git a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh
new file mode 100644
index 0000000000..dca689f88c
--- /dev/null
+++ b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh
@@ -0,0 +1,20 @@
+p latency check, 2 x 1 byte, same direction, shared link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1sl.xml --log=sd_kernel.thres=warning "--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.
+> 2.5
+
+p latency check, 2 x 1 byte, same direction, fat pipe
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1fl.xml --log=sd_kernel.thres=warning "--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.
+> 1.5
+
+p latency check, 2 x 1 byte, same direction, link - switch - link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1switch.xml --log=sd_kernel.thres=warning "--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.
+> 4
diff --git a/teshsuite/simdag/network/p2p/p2p-latency3.c b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/p2p-latency3.c
rename to teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c
diff --git a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh
new file mode 100644
index 0000000000..0e889b22d7
--- /dev/null
+++ b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh
@@ -0,0 +1,21 @@
+
+p latency check, 2 x 1 byte, opposite direction, shared link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 2.5
+
+p latency check, 2 x 1 byte, opposite direction, fat pipe
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 1.5
+
+p latency check, 2 x 1 byte, opposite direction, link - switch - link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 4
diff --git a/teshsuite/simdag/network/p2p/p2p-latency_bound.c b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/p2p-latency_bound.c
rename to teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c
diff --git a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh
new file mode 100644
index 0000000000..cc720c0ea0
--- /dev/null
+++ b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh
@@ -0,0 +1,7 @@
+
+p latency bounded by large latency link
+! output sort
+
+$ ${bindir:=.}/comm-p2p-latency-bound ../platforms/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
+> 10001.5
diff --git a/teshsuite/simdag/incomplete/CMakeLists.txt b/teshsuite/simdag/incomplete/CMakeLists.txt
deleted file mode 100644
index 116b3495f7..0000000000
--- a/teshsuite/simdag/incomplete/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_executable       (incomplete incomplete.c)
-target_link_libraries(incomplete simgrid)
-
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.tesh  PARENT_SCOPE)
-set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.c     PARENT_SCOPE)
-
-ADD_TESH(tesh-simdag-incomplete --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/incomplete --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete incomplete.tesh)
-
diff --git a/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt
deleted file mode 100644
index 4c7843063d..0000000000
--- a/teshsuite/simdag/network/mxn/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-foreach(x mxn-all2all mxn-independent_comm mxn-scatter)
-  add_executable       (${x} ${x}.c)
-  target_link_libraries(${x} simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
-
-  ADD_TESH(tesh-simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/${x}.tesh)
-endforeach()
-
-set(teshsuite_src ${teshsuite_src}                                                     PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                        PARENT_SCOPE)
-set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/platform_4p_1switch.xml  PARENT_SCOPE)
diff --git a/teshsuite/simdag/network/mxn/mxn-all2all.tesh b/teshsuite/simdag/network/mxn/mxn-all2all.tesh
deleted file mode 100644
index 11fe6e72ff..0000000000
--- a/teshsuite/simdag/network/mxn/mxn-all2all.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p all 2 all test, only fat pipe switch is used concurrently
-! output sort
-
-$ simdag/network/mxn/mxn-all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 8
diff --git a/teshsuite/simdag/network/mxn/mxn-independent_comm.tesh b/teshsuite/simdag/network/mxn/mxn-independent_comm.tesh
deleted file mode 100644
index cc0b32a1df..0000000000
--- a/teshsuite/simdag/network/mxn/mxn-independent_comm.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p sending on different paths test
-! output sort
-
-$ simdag/network/mxn/mxn-independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 3
diff --git a/teshsuite/simdag/network/mxn/mxn-scatter.tesh b/teshsuite/simdag/network/mxn/mxn-scatter.tesh
deleted file mode 100644
index b4e3389fb2..0000000000
--- a/teshsuite/simdag/network/mxn/mxn-scatter.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p scatter test
-! output sort
-
-$ simdag/network/mxn/mxn-scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 8
diff --git a/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt
deleted file mode 100644
index 7ff52668bf..0000000000
--- a/teshsuite/simdag/network/p2p/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-foreach(x p2p-latency1 p2p-latency2 p2p-latency3 p2p-latency_bound)
-  add_executable       (${x} ${x}.c)
-  target_link_libraries(${x} simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
-
-  ADD_TESH(tesh-simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/${x}.tesh)
-endforeach()
-
-set(teshsuite_src ${teshsuite_src}                                                     PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                        PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml PARENT_SCOPE)
diff --git a/teshsuite/simdag/network/p2p/p2p-latency1.tesh b/teshsuite/simdag/network/p2p/p2p-latency1.tesh
deleted file mode 100644
index 3c84318889..0000000000
--- a/teshsuite/simdag/network/p2p/p2p-latency1.tesh
+++ /dev/null
@@ -1,21 +0,0 @@
-
-p latency check, 1 byte, shared link
-! output sort
-
-$ simdag/network/p2p/p2p-latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 1.5
-
-p latency check, 1 byte, fat pipe
-! output sort
-
-$ simdag/network/p2p/p2p-latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 1.5
-
-p latency check, 1 byte, link - switch - link
-! output sort
-
-$ simdag/network/p2p/p2p-latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 3
diff --git a/teshsuite/simdag/network/p2p/p2p-latency2.tesh b/teshsuite/simdag/network/p2p/p2p-latency2.tesh
deleted file mode 100644
index dffed7b0f3..0000000000
--- a/teshsuite/simdag/network/p2p/p2p-latency2.tesh
+++ /dev/null
@@ -1,21 +0,0 @@
-
-p latency check, 2 x 1 byte, same direction, shared link
-! output sort
-
-$ simdag/network/p2p/p2p-latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 2.5
-
-p latency check, 2 x 1 byte, same direction, fat pipe
-! output sort
-
-$ simdag/network/p2p/p2p-latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 1.5
-
-p latency check, 2 x 1 byte, same direction, link - switch - link
-! output sort
-
-$ simdag/network/p2p/p2p-latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 4
diff --git a/teshsuite/simdag/network/p2p/p2p-latency3.tesh b/teshsuite/simdag/network/p2p/p2p-latency3.tesh
deleted file mode 100644
index 53b7e618b1..0000000000
--- a/teshsuite/simdag/network/p2p/p2p-latency3.tesh
+++ /dev/null
@@ -1,21 +0,0 @@
-
-p latency check, 2 x 1 byte, opposite direction, shared link
-! output sort
-
-$ simdag/network/p2p/p2p-latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 2.5
-
-p latency check, 2 x 1 byte, opposite direction, fat pipe
-! output sort
-
-$ simdag/network/p2p/p2p-latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 1.5
-
-p latency check, 2 x 1 byte, opposite direction, link - switch - link
-! output sort
-
-$ simdag/network/p2p/p2p-latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 4
diff --git a/teshsuite/simdag/network/p2p/p2p-latency_bound.tesh b/teshsuite/simdag/network/p2p/p2p-latency_bound.tesh
deleted file mode 100644
index 025ce1177c..0000000000
--- a/teshsuite/simdag/network/p2p/p2p-latency_bound.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p latency bounded by large latency link
-! output sort
-
-$ simdag/network/p2p/p2p-latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--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.
-> 10001.5
diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index ba75fa2e25..419f5ef872 100644
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -31,6 +31,7 @@ set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijks
                                     ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform_4p_1switch.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml
@@ -47,6 +48,10 @@ set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijks
                                     ${CMAKE_CURRENT_SOURCE_DIR}/clusterA.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/clusterB.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/Dijkstra.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/bogus_disk_attachment.xml                  PARENT_SCOPE)
 set(teshsuite_src ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.cpp
                                     ${CMAKE_CURRENT_SOURCE_DIR}/is_router_test.cpp                         PARENT_SCOPE)
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml b/teshsuite/simdag/platforms/platform_2p_1bb.xml
similarity index 100%
rename from teshsuite/simdag/network/p2p/platform_2p_1bb.xml
rename to teshsuite/simdag/platforms/platform_2p_1bb.xml
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/platforms/platform_2p_1fl.xml
similarity index 100%
rename from teshsuite/simdag/network/p2p/platform_2p_1fl.xml
rename to teshsuite/simdag/platforms/platform_2p_1fl.xml
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/platforms/platform_2p_1sl.xml
similarity index 100%
rename from teshsuite/simdag/network/p2p/platform_2p_1sl.xml
rename to teshsuite/simdag/platforms/platform_2p_1sl.xml
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/platforms/platform_2p_1switch.xml
similarity index 100%
rename from teshsuite/simdag/network/p2p/platform_2p_1switch.xml
rename to teshsuite/simdag/platforms/platform_2p_1switch.xml
diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/platforms/platform_4p_1switch.xml
similarity index 100%
rename from teshsuite/simdag/network/mxn/platform_4p_1switch.xml
rename to teshsuite/simdag/platforms/platform_4p_1switch.xml
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 6afb9b4b41..3ddc2afda8 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -997,11 +997,8 @@ set(CMAKEFILES_TXT
   teshsuite/msg/CMakeLists.txt
   teshsuite/msg/trace/CMakeLists.txt
 
-  teshsuite/simdag/availability/CMakeLists.txt
+  teshsuite/simdag/CMakeLists.txt
   teshsuite/simdag/basic/CMakeLists.txt
-  teshsuite/simdag/incomplete/CMakeLists.txt
-  teshsuite/simdag/network/mxn/CMakeLists.txt
-  teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt