From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 17 Mar 2016 17:02:52 +0000 (+0100)
Subject: still messing around with cmake
X-Git-Tag: v3_13~387
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/028600ff598195e84323493a1f790c2df5ef3bb2

still messing around with cmake
---

diff --git a/.gitignore b/.gitignore
index 89a9d75f20..da9137ad07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,14 +278,15 @@ teshsuite/msg/storage_client_server/storage_client_server
 teshsuite/msg/task_destroy_cancel/task_destroy_cancel
 teshsuite/msg/trace_integration/trace_integration
 teshsuite/simdag/availability/availability
-teshsuite/simdag/basic/basic0
-teshsuite/simdag/basic/basic1
-teshsuite/simdag/basic/basic2
-teshsuite/simdag/basic/basic3
-teshsuite/simdag/basic/basic4
-teshsuite/simdag/basic/basic5
-teshsuite/simdag/basic/basic6
 teshsuite/simdag/basic-link-test/basic-link-test
+teshsuite/simdag/basic-parsing-test/basic-parsing-test/
+teshsuite/simdag/basic0/basic0
+teshsuite/simdag/basic1/basic1
+teshsuite/simdag/basic2/basic2
+teshsuite/simdag/basic3/basic3
+teshsuite/simdag/basic4/basic4
+teshsuite/simdag/basic5/basic5
+teshsuite/simdag/basic6/basic6
 teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all
 teshsuite/simdag/comm-mxn-independent/comm-mxn-independent
 teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter
@@ -295,14 +296,11 @@ teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3
 teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound
 teshsuite/simdag/comp-only-par/comp-only-par
 teshsuite/simdag/comp-only-seq/comp-only-seq
+teshsuite/simdag/flatifier/flatifier
 teshsuite/simdag/incomplete/incomplete
-teshsuite/simdag/platforms/basic_parsing_test
-teshsuite/simdag/platforms/basic_tracing
+teshsuite/simdag/is-router/is-router
 teshsuite/simdag/platforms/evaluate_get_route_time
 teshsuite/simdag/platforms/evaluate_parse_time
-teshsuite/simdag/flatifier/flatifier
-teshsuite/simdag/platforms/graphicator
-teshsuite/simdag/is-router/is-router
 teshsuite/simix/check_defaults/check_defaults
 teshsuite/simix/stack_overflow/stack_overflow
 teshsuite/smpi/bug-17132/bug-17132
diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index edffd4cd2f..27f8783158 100644
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -1,4 +1,5 @@
-foreach(x availability basic-link-test comm-mxn-all2all comm-mxn-independent comm-mxn-scatter comm-p2p-latency-1 
+foreach(x availability basic0 basic1 basic2 basic3 basic4 basic5 basic6 basic-link-test basic-parsing-test
+          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 comp-only-par comp-only-seq incomplete)
   add_executable       (${x}  ${x}/${x}.c)
   target_link_libraries(${x}  simgrid)
@@ -21,5 +22,14 @@ foreach(x flatifier is-router)
   ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh)
 endforeach()
 
+ADD_TESH(tesh-simdag-parser-bypass   --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic-parsing-test --setenv srcdir=${CMAKE_HOME_DIRECTORY} basic-parsing-test-bypass.tesh)
+ADD_TESH(tesh-simdag-parser-sym-full --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic-parsing-test basic-parsing-test-sym-full.tesh)
+
+ADD_TEST(tesh-simdag-full-links01    ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
+ADD_TEST(tesh-simdag-full-links02    ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)
+ADD_TEST(tesh-simdag-one-link-g5k    ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
+
 set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
-set(tesh_files    ${tesh_files}     PARENT_SCOPE)
+set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh
+                                    PARENT_SCOPE)
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
similarity index 98%
rename from teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
rename to teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
index 8e91ed5eb8..59a164e371 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
@@ -2,7 +2,7 @@
 
 p Testing a bypass ASroute
 ! output sort
-$ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassASroute.xml FULL_LINK
+$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassASroute.xml FULL_LINK
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 3, link number: 11
 > Route between 1 and 1
@@ -62,7 +62,7 @@ $ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassASroute.
 
 p Testing a bypass route
 
-$ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassRoute.xml FULL_LINK
+$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassRoute.xml FULL_LINK
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 4, link number: 10
 > Route between AS_2_host1 and AS_2_host1
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
similarity index 83%
rename from teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
rename to teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
index d26514232e..0e647a1fca 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 ! output sort
 
-$ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_fullduplex.xml FULL_LINK "--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.
 > Workstation number: 5, link number: 12
 > Route between bob3.hamburger.edu and bob3.hamburger.edu
@@ -155,7 +155,7 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro
 >   Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.000600, route bandwidth = 125000000.000000
 
-$ ${bindir:=.}/basic_parsing_test two_clusters.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml FULL_LINK "--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.
 > Workstation number: 4, link number: 12
 > Route between bob1.hamburger.edu and bob1.hamburger.edu
@@ -271,7 +271,7 @@ $ ${bindir:=.}/basic_parsing_test two_clusters.xml FULL_LINK "--log=root.fmt:[%1
 >   Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.000600, route bandwidth = 125000000.000000
 
-$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_symmetrical.xml FULL_LINK "--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.
 > Workstation number: 2, link number: 4
 > Route between alice and alice
@@ -295,7 +295,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
 
-$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_fullduplex.xml FULL_LINK "--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.
 > Workstation number: 2, link number: 3
 > Route between alice and alice
@@ -315,7 +315,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "-
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
 
-$ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/Dijkstra.xml FULL_LINK "--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.
 > Workstation number: 2, link number: 6
 > Route between NODO01 and NODO01
@@ -336,3 +336,75 @@ $ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r
 >   Route size 1
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
+
+$ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml FULL_LINK
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
+> Workstation number: 4, link number: 5
+> Route between host1 and host1
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between host1 and host2
+>   Route size 1
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host1 and host3
+>   Route size 1
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host1 and host4
+>   Route size 2
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+> Route between host2 and host1
+>   Route size 1
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host2 and host2
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between host2 and host3
+>   Route size 1
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host2 and host4
+>   Route size 2
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+> Route between host3 and host1
+>   Route size 1
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host3 and host2
+>   Route size 1
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host3 and host3
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between host3 and host4
+>   Route size 1
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host4 and host1
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+> Route between host4 and host2
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+> Route between host4 and host3
+>   Route size 1
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
+> Route between host4 and host4
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
similarity index 100%
rename from teshsuite/simdag/platforms/basic_parsing_test.c
rename to teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh
similarity index 56%
rename from teshsuite/simdag/platforms/basic_parsing_test.tesh
rename to teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh
index 52a9949482..49a810a981 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh
@@ -1,45 +1,45 @@
 ! output sort
 
-$ ${bindir:=.}/basic_parsing_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 5, link number: 12
 
-$ ${bindir:=.}/basic_parsing_test host_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 5, link number: 1
 
-$ ${bindir:=.}/basic_parsing_test link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 1, link number: 5
 
-$ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 3, link number: 4
 
-$ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 4, link number: 12
 
-$ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 2, link number: 4
 
-$ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../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.
 > Workstation number: 2, link number: 2
 
-$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml
+$ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 4, link number: 5
 
-$ ${bindir:=.}/basic_parsing_test ./properties.xml
+$ ${bindir:=.}/basic-parsing-test ../platforms/properties.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'TI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > Workstation number: 1, link number: 1
 
-$ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI
+$ ${bindir:=.}/basic-parsing-test ../platforms/properties.xml --cfg=cpu/optim:TI
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'TI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
 > [0.000000] [surf_parse/INFO] The custom configuration 'cpu/optim' is already defined by user!
@@ -47,11 +47,12 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > Workstation number: 1, link number: 1
 
-$ cp -f ./bob.trace ./bob0_availability_file.trace
-$ cp -f ./bob.trace ./bob2_availability_file.trace
-$ cp -f ./bob.trace ./bob0_state_file.trace
-$ cp -f ./bob.trace ./bob2_state_file.trace
-$ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
+$ cp -f ../platforms/bob.trace ../platforms/bob0_availability_file.trace
+$ cp -f ../platforms/bob.trace ../platforms/bob2_availability_file.trace
+$ cp -f ../platforms/bob.trace ../platforms/bob0_state_file.trace
+$ cp -f ../platforms/bob.trace ../platforms/bob2_state_file.trace
+$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_file.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 2, link number: 6
-$ rm -f ./bob0_availability_file.trace ./bob2_availability_file.trace ./bob0_state_file.trace ./bob2_state_file.trace
+$ rm -f ../platforms/bob0_availability_file.trace ../platforms/bob2_availability_file.trace 
+$ rm -f ../platforms/bob0_state_file.trace ../platforms/bob2_state_file.trace
diff --git a/teshsuite/simdag/basic/CMakeLists.txt b/teshsuite/simdag/basic/CMakeLists.txt
deleted file mode 100644
index 2c4ce4006f..0000000000
--- a/teshsuite/simdag/basic/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-foreach(x 0 1 2 3 4 5 6)
-  add_executable       (basic${x} basic${x}.c)
-  target_link_libraries(basic${x} simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/basic${x}.tesh)
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/basic${x}.c)
-
-  ADD_TESH(tesh-simdag-basic${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic${x}.tesh)
-endforeach()
-
-set(teshsuite_src ${teshsuite_src}                                               PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)
diff --git a/teshsuite/simdag/basic/basic0.c b/teshsuite/simdag/basic0/basic0.c
similarity index 100%
rename from teshsuite/simdag/basic/basic0.c
rename to teshsuite/simdag/basic0/basic0.c
diff --git a/teshsuite/simdag/basic/basic0.tesh b/teshsuite/simdag/basic0/basic0.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic0.tesh
rename to teshsuite/simdag/basic0/basic0.tesh
diff --git a/teshsuite/simdag/basic/basic1.c b/teshsuite/simdag/basic1/basic1.c
similarity index 100%
rename from teshsuite/simdag/basic/basic1.c
rename to teshsuite/simdag/basic1/basic1.c
diff --git a/teshsuite/simdag/basic/basic1.tesh b/teshsuite/simdag/basic1/basic1.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic1.tesh
rename to teshsuite/simdag/basic1/basic1.tesh
diff --git a/teshsuite/simdag/basic/basic2.c b/teshsuite/simdag/basic2/basic2.c
similarity index 100%
rename from teshsuite/simdag/basic/basic2.c
rename to teshsuite/simdag/basic2/basic2.c
diff --git a/teshsuite/simdag/basic/basic2.tesh b/teshsuite/simdag/basic2/basic2.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic2.tesh
rename to teshsuite/simdag/basic2/basic2.tesh
diff --git a/teshsuite/simdag/basic/basic3.c b/teshsuite/simdag/basic3/basic3.c
similarity index 100%
rename from teshsuite/simdag/basic/basic3.c
rename to teshsuite/simdag/basic3/basic3.c
diff --git a/teshsuite/simdag/basic/basic3.tesh b/teshsuite/simdag/basic3/basic3.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic3.tesh
rename to teshsuite/simdag/basic3/basic3.tesh
diff --git a/teshsuite/simdag/basic/basic4.c b/teshsuite/simdag/basic4/basic4.c
similarity index 100%
rename from teshsuite/simdag/basic/basic4.c
rename to teshsuite/simdag/basic4/basic4.c
diff --git a/teshsuite/simdag/basic/basic4.tesh b/teshsuite/simdag/basic4/basic4.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic4.tesh
rename to teshsuite/simdag/basic4/basic4.tesh
diff --git a/teshsuite/simdag/basic/basic5.c b/teshsuite/simdag/basic5/basic5.c
similarity index 100%
rename from teshsuite/simdag/basic/basic5.c
rename to teshsuite/simdag/basic5/basic5.c
diff --git a/teshsuite/simdag/basic/basic5.tesh b/teshsuite/simdag/basic5/basic5.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic5.tesh
rename to teshsuite/simdag/basic5/basic5.tesh
diff --git a/teshsuite/simdag/basic/basic6.c b/teshsuite/simdag/basic6/basic6.c
similarity index 100%
rename from teshsuite/simdag/basic/basic6.c
rename to teshsuite/simdag/basic6/basic6.c
diff --git a/teshsuite/simdag/basic/basic6.tesh b/teshsuite/simdag/basic6/basic6.tesh
similarity index 100%
rename from teshsuite/simdag/basic/basic6.tesh
rename to teshsuite/simdag/basic6/basic6.tesh
diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index 317a1f16c0..35eaab60de 100644
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -1,16 +1,11 @@
-foreach(x basic_parsing_test evaluate_parse_time evaluate_get_route_time)
+foreach(x evaluate_parse_time evaluate_get_route_time)
   add_executable       (${x} ${x}.c)
   target_link_libraries(${x} simgrid)
 
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
 endforeach()
 
-set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_failing.tesh
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_sym_full.tesh
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test.tesh
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_bypass.tesh
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/get_full_link.tesh
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh
+set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_gateway.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/bogus_disk_attachment.tesh                 PARENT_SCOPE)
 set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijkstra_ns3.xml
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
deleted file mode 100644
index 8e249d2c78..0000000000
--- a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
+++ /dev/null
@@ -1,3 +0,0 @@
-! output sort
-$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms'
diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh
deleted file mode 100644
index 894323dd29..0000000000
--- a/teshsuite/simdag/platforms/get_full_link.tesh
+++ /dev/null
@@ -1,74 +0,0 @@
-#! ./tesh
-! output sort
-
-$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK
-> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
-> Workstation number: 4, link number: 5
-> Route between host1 and host1
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host1 and host2
->   Route size 1
->   Link link1: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host1 and host3
->   Route size 1
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host1 and host4
->   Route size 2
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host2 and host1
->   Route size 1
->   Link link1: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host2 and host2
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host2 and host3
->   Route size 1
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host2 and host4
->   Route size 2
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host3 and host1
->   Route size 1
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host3 and host2
->   Route size 1
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host3 and host3
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host3 and host4
->   Route size 1
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host4 and host1
->   Route size 2
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host4 and host2
->   Route size 2
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host4 and host3
->   Route size 1
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host4 and host4
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index 6aff900269..cf159bda2a 100644
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -15,5 +15,17 @@ if(NOT enable_debug)
   ADD_TESH(tesh-xbt-log   --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/log_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_usage log_usage_ndebug.tesh)
 endif()
 
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/log_usage/log_usage_ndebug.tesh  PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                                 PARENT_SCOPE)
+if(HAVE_MMALLOC)
+  add_executable       (mmalloc_test mmalloc_test.c)
+  target_link_libraries(mmalloc_test simgrid)
+  if(${ARCH_32_BITS})
+    ADD_TESH(tesh-xbt-mmalloc-32 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_32.tesh)
+  else()
+    ADD_TESH(tesh-xbt-mmalloc-64 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_64.tesh)
+  endif()
+endif()
+
+set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/log_usage/log_usage_ndebug.tesh
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc/mmalloc_64.tesh
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc/mmalloc_32.tesh          PARENT_SCOPE)
+set(teshsuite_src ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc/mmalloc_test.c           PARENT_SCOPE)
diff --git a/teshsuite/xbt/mmalloc/CMakeLists.txt b/teshsuite/xbt/mmalloc/CMakeLists.txt
deleted file mode 100644
index 90f0889d4a..0000000000
--- a/teshsuite/xbt/mmalloc/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-if(HAVE_MMALLOC)
-  add_executable       (mmalloc_test mmalloc_test.c)
-  target_link_libraries(mmalloc_test simgrid)
-  if(${ARCH_32_BITS})
-    ADD_TESH(tesh-xbt-mmalloc-32 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_32.tesh)
-  else()
-    ADD_TESH(tesh-xbt-mmalloc-64 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_64.tesh)
-  endif()
-endif()
-
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_64.tesh
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_32.tesh  PARENT_SCOPE)
-set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_test.c   PARENT_SCOPE)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 55e4911f82..6720da96f3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,22 +1,14 @@
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate-dwarf-functions
-  ${CMAKE_CURRENT_SOURCE_DIR}/normalize-pointers.py
-  ${CMAKE_CURRENT_SOURCE_DIR}/sg_unit_extractor.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/sg_xml_unit_converter.py
-  ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_update_xml.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/fig2dev_postprocessor.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/index_create.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/xbt_log_extract_hierarchy.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/colorize.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/trace2fig.pl
-  PARENT_SCOPE
-  )
+set(bin_files ${bin_files}    ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh
+                              ${CMAKE_CURRENT_SOURCE_DIR}/generate-dwarf-functions
+                              ${CMAKE_CURRENT_SOURCE_DIR}/normalize-pointers.py
+                              ${CMAKE_CURRENT_SOURCE_DIR}/sg_unit_extractor.pl
+                              ${CMAKE_CURRENT_SOURCE_DIR}/sg_xml_unit_converter.py
+                              ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_update_xml.pl
+                              ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/fig2dev_postprocessor.pl
+                              ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/index_create.pl
+                              ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/xbt_log_extract_hierarchy.pl
+                              ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/colorize.pl
+                              ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/trace2fig.pl          PARENT_SCOPE)
 
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/simgrid.supp
-  ${CMAKE_CURRENT_SOURCE_DIR}/simgrid2vite.sed
-  PARENT_SCOPE
-  )
+set(txt_files ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/simgrid.supp
+                              ${CMAKE_CURRENT_SOURCE_DIR}/simgrid2vite.sed                        PARENT_SCOPE)
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 158a54f555..2a57f77a0a 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -988,22 +988,20 @@ set(CMAKEFILES_TXT
   examples/smpi/energy/f90/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
-
   teshsuite/mc/CMakeLists.txt
-  teshsuite/mc/dwarf/CMakeLists.txt
-  teshsuite/mc/dwarf_expression/CMakeLists.txt
-  teshsuite/mc/replay/CMakeLists.txt
-
+    teshsuite/mc/dwarf/CMakeLists.txt
+    teshsuite/mc/dwarf_expression/CMakeLists.txt
+    teshsuite/mc/replay/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
-
   teshsuite/simdag/CMakeLists.txt
-  teshsuite/simdag/basic/CMakeLists.txt
-  teshsuite/simdag/platforms/CMakeLists.txt
-
-  teshsuite/simix/check_defaults/CMakeLists.txt
-  teshsuite/simix/stack_overflow/CMakeLists.txt
-  
+    teshsuite/simdag/platforms/CMakeLists.txt
+    teshsuite/simix/check_defaults/CMakeLists.txt
+    teshsuite/simix/stack_overflow/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
+  teshsuite/surf/CMakeLists.txt
+    teshsuite/surf/maxmin_bench/CMakeLists.txt
+  teshsuite/xbt/CMakeLists.txt
+  
   teshsuite/smpi/isp/umpire/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
@@ -1036,12 +1034,6 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
   
-  teshsuite/surf/CMakeLists.txt
-  teshsuite/surf/maxmin_bench/CMakeLists.txt
-  
-  teshsuite/xbt/CMakeLists.txt
-  teshsuite/xbt/mmalloc/CMakeLists.txt
-
   tools/CMakeLists.txt
   tools/graphicator/CMakeLists.txt
   tools/tesh/CMakeLists.txt
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index ed397495b1..87f5a98f02 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -46,9 +46,9 @@ IF(NOT enable_memcheck)
   ### GENERIC  ###
   # BEGIN TESH TESTS
   # test for code coverage
-    ADD_TEST(test-help                             ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help)
-    ADD_TEST(test-help-models                      ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-models)
-    ADD_TEST(test-tracing-help                   ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-tracing)
+    ADD_TEST(test-help            ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test --help)
+    ADD_TEST(test-help-models     ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test --help-models)
+    ADD_TEST(test-tracing-help    ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test --help-tracing)
   # END TESH TESTS
 
   ADD_TESH(mc-replay-random-bug                  --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug_replay.tesh)
@@ -100,13 +100,6 @@ IF(NOT enable_memcheck)
       set_property(TEST tesh-parser-bogus-disk-attachment PROPERTY WILL_FAIL TRUE)
     ENDIF()
   ENDIF()
-  ADD_TESH(tesh-simdag-bypass                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
-  ADD_TESH(tesh-simdag-parser                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
-  ADD_TESH(tesh-simdag-parser-sym-full           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
-  ADD_TESH(tesh-simdag-full-links                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
-  ADD_TEST(tesh-simdag-full-links01                ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
-  ADD_TEST(tesh-simdag-full-links02                ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)
-  ADD_TEST(tesh-simdag-one-link-g5k                ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
   # END TESH TESTS
 
   ### SMPI ###