Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
These tests can only work when assertions are enabled
[simgrid.git] / buildtools / Cmake / AddTestsWin.cmake
index 029c302..5061dd9 100644 (file)
@@ -1,17 +1,17 @@
 if(enable_memcheck)\r
        exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION")\r
-       if(VALGRIND_VERSION AND PERL_EXECUTABLE)\r
+       if(VALGRIND_VERSION)\r
                string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")\r
                if(NEW_VALGRIND_VERSION)\r
-                       exec_program("${PROJECT_DIRECTORY}/buildtools/Cmake/generate_memcheck_tests.pl ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${PROJECT_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake")\r
+                       exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake")\r
                else(NEW_VALGRIND_VERSION)\r
                        set(enable_memcheck false)\r
                        message("Command valgrind not found --> enable_memcheck autoset to false.")\r
                endif(NEW_VALGRIND_VERSION)\r
-       else(VALGRIND_VERSION AND PERL_EXECUTABLE)\r
+       else(VALGRIND_VERSION)\r
                set(enable_memcheck false)\r
-               message(FATAL_ERROR "Command valgrind or perl not found --> enable_memcheck autoset to false.")\r
-       endif(VALGRIND_VERSION AND PERL_EXECUTABLE)\r
+               message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")\r
+       endif(VALGRIND_VERSION)\r
 endif(enable_memcheck)\r
 \r
 ### For code coverage\r
@@ -23,214 +23,132 @@ SET(DROP_LOCATION "/submit.php?project=${PROJECT_NAME}")
 SET(DROP_SITE_CDASH TRUE)\r
 SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi")\r
 set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")\r
-SET(VALGRIND_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")\r
-SET(MEMORYCHECK_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")\r
+SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")\r
+SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")\r
 #If you use the --read-var-info option Memcheck will run more slowly but may give a more detailed description of any illegal address.\r
 \r
 INCLUDE(CTest)\r
 ENABLE_TESTING()\r
 \r
-# BEGIN TESH TESTS\r
-\r
-# teshsuite/xbt\r
-IF(${ARCH_32_BITS})\r
-  ADD_TEST(tesh-gras-msg_handle-sg-32  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_32)\r
-ELSE(${ARCH_32_BITS})\r
-  ADD_TEST(tesh-gras-msg_handle-sg-64  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_64)\r
-ENDIF(${ARCH_32_BITS})\r
-\r
-ADD_TEST(tesh-gras-empty_main-rl       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/empty_main/test_rl)\r
-ADD_TEST(tesh-gras-empty_main-sg       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/empty_main/test_sg)\r
-\r
-IF(${ARCH_32_BITS})\r
-  ADD_TEST(tesh-gras-small_sleep-sg-32 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32)\r
-ELSE(${ARCH_32_BITS})\r
-  ADD_TEST(tesh-gras-small_sleep-sg-64 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64)\r
-ENDIF(${ARCH_32_BITS})\r
-\r
-ADD_TEST(tesh-msg-get_sender   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh)                              \r
-ADD_TEST(tesh-simdag-reinit_costs      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)\r
-ADD_TEST(tesh-simdag-parser            perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)\r
-ADD_TEST(tesh-simdag-flatifier         perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)\r
-ADD_TEST(tesh-simdag-basic0    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh)\r
-ADD_TEST(tesh-simdag-basic1    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh)\r
-ADD_TEST(tesh-simdag-basic2    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh)\r
-ADD_TEST(tesh-simdag-basic3    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic3.tesh)\r
-ADD_TEST(tesh-simdag-basic4    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic4.tesh)\r
-ADD_TEST(tesh-simdag-basic5    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic5.tesh)\r
-ADD_TEST(tesh-simdag-basic6    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic6.tesh)\r
-ADD_TEST(tesh-simdag-p2p-1     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)\r
-ADD_TEST(tesh-simdag-p2p-2     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)\r
-ADD_TEST(tesh-simdag-p2p-3     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)\r
-ADD_TEST(tesh-simdag-p2p-3     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)\r
-ADD_TEST(tesh-simdag-mxn-1     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)\r
-ADD_TEST(tesh-simdag-mxn-2     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)\r
-ADD_TEST(tesh-simdag-mxn-3     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)\r
-ADD_TEST(tesh-simdag-par-1     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh)\r
-ADD_TEST(tesh-simdag-par-2     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh)\r
-\r
-# GRAS examples\r
-ADD_TEST(gras-ping-rl          perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/ping test_rl)\r
-ADD_TEST(gras-rpc-rl           perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/rpc test_rl)\r
-ADD_TEST(gras-spawn-rl         perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/spawn test_rl)\r
-\r
-ADD_TEST(gras-timer-rl         perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/timer test_rl)\r
-set_tests_properties(gras-timer-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-chrono-rl                perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/chrono test_rl)\r
-set_tests_properties(gras-chrono-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-simple_token-rl  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_rl)\r
-\r
-ADD_TEST(gras-mmrpc-rl         perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mmrpc test_rl)\r
-set_tests_properties(gras-mmrpc-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-all2all-rl       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/all2all test_rl)\r
-set_tests_properties(gras-all2all-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-pmm-rl           perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/pmm test_rl)\r
-set_tests_properties(gras-pmm-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-synchro-rl       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/synchro test_rl)\r
-set_tests_properties(gras-synchro-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-properties-rl    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/properties test_rl)\r
-set_tests_properties(gras-properties-rl PROPERTIES TIMEOUT 10)\r
+ADD_TEST(tesh-msg-get-sender               perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite msg/get_sender.tesh)\r
+ADD_TEST(tesh-simdag-reinit-costs              perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)\r
+ADD_TEST(tesh-simdag-parser                        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)\r
+\r
+IF(enable_debug)\r
+ADD_TEST(tesh-simdag-parser-bogus-symmetric perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)\r
+ENDIF(enable_debug)\r
+\r
+ADD_TEST(tesh-simdag-parser-sym-full           perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)\r
+ADD_TEST(tesh-simdag-flatifier                 perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)\r
+ADD_TEST(tesh-simdag-full-links                        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)\r
+ADD_TEST(tesh-simdag-basic0    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic0.tesh)\r
+ADD_TEST(tesh-simdag-basic1    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic1.tesh)\r
+ADD_TEST(tesh-simdag-basic2    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic2.tesh)\r
+ADD_TEST(tesh-simdag-basic3    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic3.tesh)\r
+ADD_TEST(tesh-simdag-basic4    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic4.tesh)\r
+ADD_TEST(tesh-simdag-basic5    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic5.tesh)\r
+ADD_TEST(tesh-simdag-basic6    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic6.tesh)\r
+ADD_TEST(tesh-simdag-p2p-1     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)\r
+ADD_TEST(tesh-simdag-p2p-2     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)\r
+ADD_TEST(tesh-simdag-p2p-3     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)\r
+ADD_TEST(tesh-simdag-p2p-4     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)\r
+ADD_TEST(tesh-simdag-mxn-1     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)\r
+ADD_TEST(tesh-simdag-mxn-2     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)\r
+ADD_TEST(tesh-simdag-mxn-3     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)\r
+ADD_TEST(tesh-simdag-par-1     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh)\r
+ADD_TEST(tesh-simdag-par-2     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh)\r
 \r
 # MSG examples\r
-ADD_TEST(msg-suspend           perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg suspend/suspend.tesh)\r
-ADD_TEST(msg-masterslave       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave.tesh)\r
-ADD_TEST(msg-masterslave-forwarder     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_forwarder.tesh)\r
-ADD_TEST(msg-masterslave-failure       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_failure.tesh)\r
-ADD_TEST(msg-masterslave-bypass        perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh)\r
-ADD_TEST(msg-masterslave-mailbox       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh)\r
-ADD_TEST(msg-masterslave-vivaldi       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_vivaldi.tesh)\r
-ADD_TEST(msg-migration         perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg migration/migration.tesh)\r
-ADD_TEST(msg-ptask             perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh)\r
-ADD_TEST(msg-priority          ${PROJECT_DIRECTORY}/examples/msg/priority/priority.exe ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml  ${PROJECT_DIRECTORY}/examples/msg/priority/deployment_priority.xml)\r
-ADD_TEST(msg-properties                perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg properties/msg_prop.tesh)\r
-ADD_TEST(msg-trace             perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg trace/trace.tesh)\r
-ADD_TEST(msg-masterslave_cpu_ti        perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh)\r
-ADD_TEST(msg_icomms perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/icomms peer.tesh)\r
-ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 \r
-                                                               ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml\r
-                                                               ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)\r
+ADD_TEST(msg-suspend           perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg suspend/suspend.tesh)\r
+ADD_TEST(msg-masterslave       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave.tesh)\r
+ADD_TEST(msg-masterslave-forwarder     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_forwarder.tesh)\r
+ADD_TEST(msg-masterslave-failure       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_failure.tesh)\r
+ADD_TEST(msg-masterslave-bypass        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh)\r
+ADD_TEST(msg-masterslave-mailbox       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh)\r
+ADD_TEST(msg-masterslave-vivaldi       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_vivaldi.tesh)\r
+ADD_TEST(msg-migration         perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg migration/migration.tesh)\r
+ADD_TEST(msg-ptask             perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh)\r
+ADD_TEST(msg-priority          ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.exe ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml  ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/deployment_priority.xml)\r
+ADD_TEST(msg-properties                perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg properties/msg_prop.tesh)\r
+ADD_TEST(msg-trace             perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg trace/trace.tesh)\r
+ADD_TEST(msg-masterslave-cpu-ti        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh)\r
+ADD_TEST(msg-icomms perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms peer.tesh)\r
+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)\r
 \r
 IF(HAVE_TRACING)\r
-  ADD_TEST(tracing-ms perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/ms.tesh)\r
-  ADD_TEST(tracing-categories perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/categories.tesh)\r
-  ADD_TEST(tracing-volume perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/volume.tesh)\r
-  ADD_TEST(tracing-tasks perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/tasks.tesh)\r
-  ADD_TEST(tracing-process-migration perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/procmig.tesh)\r
+  ADD_TEST(tracing-ms perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)\r
+  ADD_TEST(tracing-categories perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)\r
+  ADD_TEST(tracing-volume perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/volume.tesh)\r
+  ADD_TEST(tracing-tasks perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh)\r
+  ADD_TEST(tracing-process-migration perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)\r
 ENDIF(HAVE_TRACING)\r
 \r
 IF(${ARCH_32_BITS})\r
-  ADD_TEST(gras-ping-sg-32     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/ping test_sg_32)\r
-  ADD_TEST(gras-rpc-sg-32      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/rpc test_sg_32)\r
-  ADD_TEST(gras-spawn-sg-32    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/spawn test_sg_32)\r
-  ADD_TEST(gras-timer-sg-32    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/timer test_sg_32)\r
-  ADD_TEST(gras-chrono-sg-32   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/chrono test_sg_32)\r
-  ADD_TEST(gras-simple_token-sg-32     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_sg_32)\r
-  ADD_TEST(gras-mmrpc-sg-32    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mmrpc test_sg_32)\r
-  ADD_TEST(gras-all2all-sg-32  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/all2all test_sg_32)\r
-  ADD_TEST(gras-pmm-sg-32      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/pmm test_sg_32)\r
-  ADD_TEST(gras-synchro-sg-32  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/synchro test_sg_32)\r
+  ADD_TEST(gras-ping-sg-32     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_sg_32.tesh)\r
+  ADD_TEST(gras-rpc-sg-32      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_sg_32.tesh)\r
+  ADD_TEST(gras-spawn-sg-32    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_sg_32.tesh)\r
+  ADD_TEST(gras-timer-sg-32    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_sg_32.tesh)\r
+  ADD_TEST(gras-chrono-sg-32   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_sg_32.tesh)\r
+  ADD_TEST(gras-simple-token-sg-32     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple-token test_sg_32.tesh)\r
+  ADD_TEST(gras-mmrpc-sg-32    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_sg_32.tesh)\r
+  ADD_TEST(gras-all2all-sg-32  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_sg_32.tesh)\r
+  ADD_TEST(gras-pmm-sg-32      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_sg_32.tesh)\r
+  ADD_TEST(gras-synchro-sg-32  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_sg_32.tesh)\r
 ELSE(${ARCH_32_BITS})\r
-  ADD_TEST(gras-ping-sg-64     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/ping test_sg_64)\r
-  ADD_TEST(gras-rpc-sg-64      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/rpc test_sg_64)\r
-  ADD_TEST(gras-spawn-sg-64    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/spawn test_sg_64)\r
-  ADD_TEST(gras-timer-sg-64    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/timer test_sg_64)\r
-  ADD_TEST(gras-chrono-sg-64   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/chrono test_sg_64)\r
-  ADD_TEST(gras-simple_token-sg-64     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_sg_64)\r
-  ADD_TEST(gras-mmrpc-sg-64    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mmrpc test_sg_64)\r
-  ADD_TEST(gras-all2all-sg-64  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/all2all test_sg_64)\r
-  ADD_TEST(gras-pmm-sg-64      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/pmm test_sg_64)\r
-  ADD_TEST(gras-synchro-sg-64  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/synchro test_sg_64)\r
+  ADD_TEST(gras-ping-sg-64     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_sg_64.tesh)\r
+  ADD_TEST(gras-rpc-sg-64      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_sg_64.tesh)\r
+  ADD_TEST(gras-spawn-sg-64    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_sg_64.tesh)\r
+  ADD_TEST(gras-timer-sg-64    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_sg_64.tesh)\r
+  ADD_TEST(gras-chrono-sg-64   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_sg_64.tesh)\r
+  ADD_TEST(gras-simple-token-sg-64     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_sg_64.tesh)\r
+  ADD_TEST(gras-mmrpc-sg-64    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_sg_64.tesh)\r
+  ADD_TEST(gras-all2all-sg-64  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_sg_64.tesh)\r
+  ADD_TEST(gras-pmm-sg-64      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_sg_64.tesh)\r
+  ADD_TEST(gras-synchro-sg-64  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_sg_64.tesh)\r
 ENDIF(${ARCH_32_BITS})\r
-ADD_TEST(gras-properties-sg    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/properties test_sg)\r
+ADD_TEST(gras-properties-sg    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/properties test_sg.tesh)\r
 \r
 # simdag examples\r
-ADD_TEST(simdag-test_simdag    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/simdag test_simdag.tesh)\r
-ADD_TEST(simdag-test_simdag2   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/simdag test_simdag2.tesh)\r
-ADD_TEST(simdag-test_simdag_seq_access perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/simdag test_simdag_seq_access.tesh)\r
-ADD_TEST(simdag-test_prop      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/simdag properties/test_prop.tesh)\r
-ADD_TEST(simdag-metaxml_test   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)\r
+ADD_TEST(simdag-test-simdag    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag.tesh)\r
+ADD_TEST(simdag-test-simdag2   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag2.tesh)\r
+ADD_TEST(simdag-test-simdag-seq-access perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag_seq_access.tesh)\r
+ADD_TEST(simdag-test-prop      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag properties/test_prop.tesh)\r
+ADD_TEST(simdag-metaxml-test   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)\r
 set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true)\r
-ADD_TEST(simdag-minmin_test    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)\r
+ADD_TEST(simdag-minmin-test    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)\r
 \r
 if(enable_smpi)\r
 # smpi examples\r
-ADD_TEST(smpi-bcast    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/bcast.tesh)\r
-ADD_TEST(smpi-reduce   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/reduce.tesh)\r
+ADD_TEST(smpi-bcast    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)\r
+ADD_TEST(smpi-reduce   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)\r
 if(HAVE_TRACING)\r
-  ADD_TEST(smpi-tracing-ptp perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh)\r
+  ADD_TEST(smpi-tracing-ptp perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_traced.tesh)\r
 endif(HAVE_TRACING)\r
 endif(enable_smpi)\r
-\r
-if(HAVE_GTNETS)\r
-ADD_TEST(msg-gtnets-waxman                     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh)\r
-ADD_TEST(msg-gtnets-dogbone                    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh)\r
-ADD_TEST(msg-gtnets-onelink                    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-gtnets.tesh)\r
-ADD_TEST(msg-gtnets-dogbone-lv08       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-lv08.tesh)\r
-ADD_TEST(msg-gtnets-onelink-lv08       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh)\r
-  if(HAVE_TRACING)\r
-  ADD_TEST(msg-tracing-gtnets-waxman                   perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-waxman.tesh)\r
-  ADD_TEST(msg-tracing-gtnets-dogbone                  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-gtnets.tesh)\r
-  ADD_TEST(msg-tracing-gtnets-onelink                  perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-gtnets.tesh)\r
-  ADD_TEST(msg-tracing-gtnets-dogbone-lv08     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-lv08.tesh)\r
-  ADD_TEST(msg-tracing-gtnets-onelink-lv08     perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-lv08.tesh)\r
-  endif(HAVE_TRACING)\r
-endif(HAVE_GTNETS)\r
-\r
-# Lua examples\r
-if(HAVE_LUA)\r
-ADD_TEST(lua-masterslave               perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh)\r
-ADD_TEST(lua-mult_matrix               perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh)\r
-ADD_TEST(lua-masterslave_bypass perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh)\r
-ADD_TEST(msg-masterslave-console       perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh)\r
-endif(HAVE_LUA)\r
-\r
-# Ruby examples\r
-if(HAVE_RUBY)\r
-ADD_TEST(ruby-masterslave      perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby MasterSlave.tesh)\r
-ADD_TEST(ruby-ping_pong                perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby PingPong.tesh)\r
-ADD_TEST(ruby-quicksort                perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby Quicksort.tesh)\r
-endif(HAVE_RUBY)\r
-\r
-# END TESH TESTS\r
-\r
+                                                               \r
+# examples/msg/mc\r
 if(HAVE_MC)\r
-ADD_TEST(mc-bugged1                    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc bugged1.tesh)\r
-ADD_TEST(mc-bugged2                    perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc bugged2.tesh)\r
-ADD_TEST(mc-centralized                perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc centralized.tesh)\r
+ADD_TEST(mc-bugged1                    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)\r
+ADD_TEST(mc-bugged2                    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)\r
+ADD_TEST(mc-centralized                perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)\r
 endif(HAVE_MC)\r
 \r
-if(HAVE_JAVA)\r
-# java examples\r
-ADD_TEST(java-basic    ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest ${simgrid_BINARY_DIR})\r
-ADD_TEST(java-pingpong         ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest ${simgrid_BINARY_DIR})\r
-ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest ${simgrid_BINARY_DIR})\r
-ADD_TEST(java-suspend  ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest ${simgrid_BINARY_DIR})\r
-endif(HAVE_JAVA)\r
+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)\r
+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)\r
+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)\r
+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)\r
 \r
-if(HAVE_RUBY)\r
-set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true)\r
-endif(HAVE_RUBY)\r
-\r
-ADD_TEST(tesh-log-large                ${PROJECT_DIRECTORY}/teshsuite/xbt/log_large_test --log=root.fmt:%m%n)\r
-\r
-ADD_TEST(msg-sendrecv_CLM03    ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02)\r
-ADD_TEST(msg-sendrecv_Vegas    ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas")\r
-ADD_TEST(msg-sendrecv_Reno     ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical)\r
+# testsuite directory\r
+add_test(test-xbt-log          ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/log_usage)\r
+add_test(test-xbt-graphxml     ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml)\r
+add_test(test-xbt-heap         ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/heap_bench)\r
 \r
+add_test(test-surf-lmm         ${CMAKE_HOME_DIRECTORY}/testsuite/surf/lmm_usage)\r
+add_test(test-surf-maxmin      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/maxmin_bench)\r
+add_test(test-surf-usage       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage  --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)\r
+add_test(test-surf-usage2      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)\r
+add_test(test-surf-trace       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/)\r
 \r
-# testsuite directory\r
-add_test(test-xbt-log          ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage)\r
-add_test(test-xbt-graphxml     ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml)\r
-add_test(test-xbt-heap         ${PROJECT_DIRECTORY}/testsuite/xbt/heap_bench)\r
+add_test(testall               ${CMAKE_HOME_DIRECTORY}/src/testall)\r
 \r
-add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)\r
-add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)\r
-add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)\r
 \r
-add_test(testall               ${PROJECT_DIRECTORY}/src/testall)
\ No newline at end of file