Change order of tests for generate correctly memcheck tests.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8422 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index f0f7337..10296ef 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -191,15 +191,6 @@ ADD_TEST(simdag-test_prop  ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}
 ADD_TEST(simdag-metaxml_test   ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)
 ADD_TEST(simdag-minmin_test    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
 
-if(enable_smpi)
-# smpi examples
-ADD_TEST(smpi-bcast    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/bcast.tesh)
-ADD_TEST(smpi-reduce   ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/reduce.tesh)
-if(HAVE_TRACING)
-  ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh)
-endif(HAVE_TRACING)
-endif(enable_smpi)
-
 if(HAVE_GTNETS)
 ADD_TEST(msg-gtnets-waxman                     ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh)
 ADD_TEST(msg-gtnets-dogbone                    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh)
@@ -232,13 +223,16 @@ endif(HAVE_RUBY)
 
 # END TESH TESTS
 
-ADD_TEST(tesh-simdag-full-links01              ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
-ADD_TEST(tesh-simdag-full-links02              ${CMAKE_HOME_DIRECTORY}/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_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
-ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 
-                                                               ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml
-                                                               ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
-
+if(enable_smpi)
+# smpi examples
+ADD_TEST(smpi-bcast    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/bcast.tesh)
+ADD_TEST(smpi-reduce   ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/reduce.tesh)
+if(HAVE_TRACING)
+  ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh)
+endif(HAVE_TRACING)
+endif(enable_smpi)
+                                                               
+# examples/msg/mc
 if(HAVE_MC)
 ADD_TEST(mc-bugged1                    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/mc bugged1.tesh)
 ADD_TEST(mc-bugged2                    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/mc bugged2.tesh)
@@ -303,21 +297,26 @@ endif(GRAS_IS_BROKEN)
 
 endif(NOT enable_memcheck)
 
+ADD_TEST(tesh-simdag-full-links01              ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
+ADD_TEST(tesh-simdag-full-links02              ${CMAKE_HOME_DIRECTORY}/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_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
+ADD_TEST(msg_icomms_waitany                    ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
+
 # testsuite directory
-add_test(test-xbt-log          ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage)
-add_test(test-xbt-graphxml     ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml)
-add_test(test-xbt-heap         ${PROJECT_DIRECTORY}/testsuite/xbt/heap_bench)
+add_test(test-xbt-log          ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/log_usage)
+add_test(test-xbt-graphxml     ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml)
+add_test(test-xbt-heap         ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/heap_bench)
 
-add_test(test-surf-lmm         ${PROJECT_DIRECTORY}/testsuite/surf/lmm_usage)
-add_test(test-surf-maxmin      ${PROJECT_DIRECTORY}/testsuite/surf/maxmin_bench)
-add_test(test-surf-usage       ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf_usage2      ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf-trace       ${PROJECT_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)
+add_test(test-surf-lmm         ${CMAKE_HOME_DIRECTORY}/testsuite/surf/lmm_usage)
+add_test(test-surf-maxmin      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/maxmin_bench)
+add_test(test-surf-usage       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
+add_test(test-surf_usage2      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
+add_test(test-surf-trace       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)
 
-add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)
-add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)
-add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)
+add_test(test-simdag-1 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)
+add_test(test-simdag-2 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)
+add_test(test-simdag-3 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)
 
-add_test(testall               ${PROJECT_DIRECTORY}/src/testall)
+add_test(testall               ${CMAKE_HOME_DIRECTORY}/src/testall)
 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)

diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake
index a30afa9..11edad6 100644 (file)
--- a/buildtools/Cmake/memcheck_tests.cmake
+++ b/buildtools/Cmake/memcheck_tests.cmake
@@ -31,52 +31,40 @@ ADD_TEST(memcheck-tesh-gras-small_sleep-sg-64-0 ./gras/small_sleep/small_sleep_s
 ENDIF(${ARCH_32_BITS})
 
 ADD_TEST(memcheck-tesh-simdag-reinit_costs-0 simdag/network/test_reinit_costs ./simdag/network/platform_2p_1sl.xml --surf-path=${PROJECT_DIRECTORY}/src --log=sd_kernel.thres=warning --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-0 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_cluster_foreach.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-1 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_cluster_one_host_random.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-2 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_cluster_one_host.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-3 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_cluster_properties_foreach.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-4 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_cluster.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-5 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-6 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host_properties.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-7 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-8 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host_state_off.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-9 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host_state_on.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-10 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host_trace_inside.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-11 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_host.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-12 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_link_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-13 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_link_fatpipe.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-14 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_link_shared.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-15 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms one_link_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-16 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms three_hosts_non_symmetric_route.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-17 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms two_clusters_symmetric.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-18 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-19 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-parser-20 simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:./simdag/platforms two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-0 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_cluster.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-1 false --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-2 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_cluster_foreach.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-3 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_cluster_one_host_random.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-4 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_cluster_one_host.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-5 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_cluster_properties_foreach.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-6 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_cluster_properties_override.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-7 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-8 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_properties.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-9 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-10 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_state_off.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-11 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_state_on.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-12 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_trace_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-13 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host_trace_inside.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-14 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_host.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-15 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_link_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-16 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_link_fatpipe.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-17 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_link_shared.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-18 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ one_link_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-19 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ route_override.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-20 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ three_hosts_non_symmetric_route.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-21 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ two_clusters_symmetric.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-22 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-23 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
-ADD_TEST(memcheck-tesh-simdag-flatifier-24 ./simdag/platforms/flatifier --cfg=path:./simdag/platforms/ two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/)
+ADD_TEST(memcheck-tesh-simdag-parser-0 ./basic_parsing_test one_cluster.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-1 ./basic_parsing_test one_host_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-2 ./basic_parsing_test one_host_properties.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-3 ./basic_parsing_test one_host_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-4 ./basic_parsing_test one_host_state_off.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-5 ./basic_parsing_test one_host_state_on.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-6 ./basic_parsing_test one_host_trace_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-7 ./basic_parsing_test one_host_trace_inside.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-8 ./basic_parsing_test one_host.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-9 ./basic_parsing_test one_link_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-10 ./basic_parsing_test one_link_fatpipe.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-11 ./basic_parsing_test one_link_shared.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-12 ./basic_parsing_test one_link_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-13 ./basic_parsing_test three_hosts_non_symmetric_route.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-14 ./basic_parsing_test two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-15 ./basic_parsing_test two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-16 ./basic_parsing_test two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-0 ./flatifier one_cluster.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-1 ./flatifier one_host_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-2 ./flatifier one_host_properties.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-3 ./flatifier one_host_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-4 ./flatifier one_host_state_off.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-5 ./flatifier one_host_state_on.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-6 ./flatifier one_host_trace_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-7 ./flatifier one_host_trace_inside.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-8 ./flatifier one_host.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-9 ./flatifier one_link_availability.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-10 ./flatifier one_link_fatpipe.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-11 ./flatifier one_link_shared.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-12 ./flatifier one_link_state_file.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-13 ./flatifier three_hosts_non_symmetric_route.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-14 ./flatifier two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-15 ./flatifier two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-flatifier-16 ./flatifier two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-basic0-0 simdag/basic0 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic1-0 simdag/basic1 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic2-0 simdag/basic2 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
@@ -118,7 +106,6 @@ ADD_TEST(memcheck-msg-masterslave-0 masterslave/masterslave_forwarder ./small_pl
 ADD_TEST(memcheck-msg-masterslave-forwarder-0 masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml  --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-failure-0 masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-bypass-0 masterslave/masterslave_bypass --log=no_loc  --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-msg-masterslave-console-0 masterslave_console platform_script.lua --log=surf_parse.thres:critical --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave//)
 ADD_TEST(memcheck-msg-masterslave-mailbox-0 masterslave/masterslave_mailbox ./small_platform_with_routers.xml ./masterslave/deployment_masterslave_mailbox.xml --trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-vivaldi-0 ./masterslave/masterslave_mailbox --cfg=network/model:Vivaldi ../platforms/vivaldi.xml ./masterslave/deployment_masterslave_vivaldi.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-migration-0 migration/migration ./msg_platform.xml ./migration/migration.deploy  --cd ${PROJECT_DIRECTORY}/examples/msg/)
@@ -148,13 +135,11 @@ ADD_TEST(memcheck-msg_icomms-3 ./peer small_platform.xml deployment_peer04.xml -
 ADD_TEST(memcheck-msg_icomms-4 ./peer2 small_platform.xml deployment_peer.xml --cd ${PROJECT_DIRECTORY}/examples/msg/icomms/)
 
 IF(HAVE_TRACING)
-ADD_TEST(memcheck-tracing-ms-0 tracing/ms ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-ms-1 cat ./tracing/../ms.trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-categories-0 tracing/categories ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-categories-1 cat ./tracing/../categories.trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-volume-0 tracing/volume ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-tasks-0 tracing/tasks ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-process-migration-0 tracing/procmig ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-ms-0 tracing/ms --cfg=tracing/filename:ms.trace --cfg=tracing/platform:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-categories-0 tracing/categories --cfg=tracing/filename:categories.trace --cfg=tracing/platform:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-volume-0 tracing/volume --cfg=tracing/filename:volume.trace --cfg=tracing/msg/volume:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-tasks-0 tracing/tasks --cfg=tracing/msg/task:1 --cfg=tracing/filename:tasks.trace ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-process-migration-0 tracing/procmig --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:1 ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ENDIF(HAVE_TRACING)
 
 IF(${ARCH_32_BITS})
@@ -199,22 +184,19 @@ ADD_TEST(memcheck-simdag-test_prop-0 properties/sd_prop ./../platforms/prop.xml
 ADD_TEST(memcheck-simdag-metaxml_test-0 metaxml/sd_meta ./../platforms/metaxml.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/)
 ADD_TEST(memcheck-simdag-minmin_test-0 ./minmin_test --log=sd_daxparse.thresh:critical ./simulacrum_7_hosts.xml ./Montage_25.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/scheduling/)
 
-if(enable_smpi)
-# smpi examples
-ADD_TEST(memcheck-smpi-bcast-0 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 3 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-bcast-1 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-bcast-2 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-reduce-0 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 3 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-reduce-1 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-reduce-2 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./reduce -q  --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-endif(enable_smpi)
-
 if(HAVE_GTNETS)
 ADD_TEST(memcheck-msg-gtnets-waxman-0 gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-dogbone-0 gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-onelink-0 gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-dogbone-lv08-0 gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-onelink-lv08-0 gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cd ${PROJECT_DIRECTORY}/examples/msg/)
+  if(HAVE_TRACING)
+ADD_TEST(memcheck-msg-tracing-gtnets-waxman-0 gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-0 gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cd ${PROJECT_DIRECTORY}/examples/msg/)
+  endif(HAVE_TRACING)
 endif(HAVE_GTNETS)
 
 # Lua examples
@@ -222,6 +204,7 @@ if(HAVE_LUA)
 ADD_TEST(memcheck-lua-masterslave-0 lua master_slave.lua --cd ${PROJECT_DIRECTORY}/examples/lua/)
 ADD_TEST(memcheck-lua-mult_matrix-0 lua mult_matrix.lua --cd ${PROJECT_DIRECTORY}/examples/lua/)
 ADD_TEST(memcheck-lua-masterslave_bypass-0 lua master_slave.lua --log=surf_parse.thres:critical --cd ${PROJECT_DIRECTORY}/examples/lua/)
+ADD_TEST(memcheck-msg-masterslave-console-0 masterslave_console platform_script.lua --log=surf_parse.thres:critical --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave//)
 endif(HAVE_LUA)
 
 # Ruby examples