X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2cea7f0885bae353473a0fad2ca431e104ce28fe..69961d7d398539bb53fb07f97a0e9482fc6d872c:/buildtools/Cmake/src/CMakeTest.txt

diff --git a/buildtools/Cmake/src/CMakeTest.txt b/buildtools/Cmake/src/CMakeTest.txt
index 7be0871721..3040074933 100644
--- a/buildtools/Cmake/src/CMakeTest.txt
+++ b/buildtools/Cmake/src/CMakeTest.txt
@@ -12,9 +12,12 @@ SET(DROP_LOCATION "/submit.php?project=${PROJECT_NAME}")
 SET(DROP_SITE_CDASH TRUE)
 SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi")
 SET(COVERAGE_COMMAND "${GCOV_PATH}/gcov")
-SET(VALGRIND_COMMAND "${VALGRIND_PATH}/valgrind")
-SET(MEMORYCHECK_COMMAND "${VALGRIND_PATH}/valgrind")
-set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
+#SET(VALGRIND_COMMAND "${VALGRIND_PATH}/valgrind")
+#SET(MEMORYCHECK_COMMAND "${VALGRIND_PATH}/valgrind")
+#set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
+set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no --valgrind ${VALGRIND_PATH}")
+SET(VALGRIND_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
+SET(MEMORYCHECK_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
 #If you use the --read-var-info option Memcheck will run more slowly but may give a more detailed description of any illegal address.
 
 ### Check 32bits or 64bits
@@ -29,7 +32,7 @@ ENDIF(SIZEOF_LONG EQUAL 4)
 INCLUDE(CTest)
 ENABLE_TESTING()
 
-# TESH autotests
+if(NOT enable_memcheck)
 ADD_TEST(tesh-self-basic 		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" basic.tesh)
 ADD_TEST(tesh-self-cd			${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" cd.tesh)
 ADD_TEST(tesh-self-IO-broken-pipe	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" IO-broken-pipe.tesh)
@@ -47,36 +50,19 @@ ADD_TEST(tesh-self-bg-basic		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJEC
 ADD_TEST(tesh-self-bg-set-signal	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" bg-set-signal.tesh)
 ADD_TEST(tesh-self-background		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" background.tesh)
 
-# 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-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-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)
-
-# teshsuite/xbt directory
+# BEGIN TESH TESTS
 
+# teshsuite/xbt
 ADD_TEST(tesh-log-large		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite xbt/log_large_test.tesh)
 ADD_TEST(tesh-log-parallel	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite xbt/parallel_log_crashtest.tesh)
 
 # teshsuite/gras/datadesc directory
 ADD_TEST(tesh-gras-dd-mem	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_mem.tesh)
 ADD_TEST(tesh-gras-dd-rw 	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_rw.tesh)
-
 ADD_TEST(tesh-gras-dd-r_little32_4	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little32_4.tesh)
 ADD_TEST(tesh-gras-dd-r_little64	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little64.tesh)
 ADD_TEST(tesh-gras-dd-r_big32_8_4	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8_4.tesh)
-
 ADD_TEST(tesh-gras-dd-r_big32_8		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8.tesh)
-
 ADD_TEST(tesh-gras-dd-r_big32_2		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_2.tesh)
 
 IF(${ARCH_32_BITS})
@@ -94,37 +80,33 @@ ELSE(${ARCH_32_BITS})
   ADD_TEST(tesh-gras-small_sleep-sg-64	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64)
 ENDIF(${ARCH_32_BITS})
 
-ADD_TEST(tesh-msg-get_sender	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "msg/get_sender.tesh")
-				    
-ADD_TEST(tesh-simdag-reinit_costs	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/test_reinit_costs.tesh")
-ADD_TEST(tesh-simdag-parser		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/platforms/basic_parsing_test.tesh")
-ADD_TEST(tesh-simdag-flatifier		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/platforms/flatifier.tesh")
-
-ADD_TEST(tesh-simdag-basic0	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic0.tesh")
-ADD_TEST(tesh-simdag-basic1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic1.tesh")
-ADD_TEST(tesh-simdag-basic2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic2.tesh")
-ADD_TEST(tesh-simdag-basic3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic3.tesh")
-ADD_TEST(tesh-simdag-basic4	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic4.tesh")
-ADD_TEST(tesh-simdag-basic5	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic5.tesh")
-ADD_TEST(tesh-simdag-basic6	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic6.tesh")
-ADD_TEST(tesh-simdag-p2p-1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency1.tesh")
-ADD_TEST(tesh-simdag-p2p-2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency2.tesh")
-ADD_TEST(tesh-simdag-p2p-3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency3.tesh")
-ADD_TEST(tesh-simdag-p2p-3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency_bound.tesh")
-
-ADD_TEST(tesh-simdag-mxn-1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/mxn/test_intra_all2all.tesh")
-ADD_TEST(tesh-simdag-mxn-2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/mxn/test_intra_independent_comm.tesh")
-ADD_TEST(tesh-simdag-mxn-3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/mxn/test_intra_scatter.tesh")
-
-ADD_TEST(tesh-simdag-par-1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/partask/test_comp_only_seq.tesh")
-ADD_TEST(tesh-simdag-par-2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/partask/test_comp_only_par.tesh")
+ADD_TEST(tesh-msg-get_sender	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh)				    
+ADD_TEST(tesh-simdag-reinit_costs	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)
+ADD_TEST(tesh-simdag-parser		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/basic_parsing_test.tesh)
+ADD_TEST(tesh-simdag-flatifier		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/flatifier.tesh)
+ADD_TEST(tesh-simdag-basic0	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh)
+ADD_TEST(tesh-simdag-basic1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh)
+ADD_TEST(tesh-simdag-basic2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh)
+ADD_TEST(tesh-simdag-basic3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic3.tesh)
+ADD_TEST(tesh-simdag-basic4	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic4.tesh)
+ADD_TEST(tesh-simdag-basic5	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic5.tesh)
+ADD_TEST(tesh-simdag-basic6	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic6.tesh)
+ADD_TEST(tesh-simdag-p2p-1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)
+ADD_TEST(tesh-simdag-p2p-2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)
+ADD_TEST(tesh-simdag-p2p-3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)
+ADD_TEST(tesh-simdag-p2p-3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)
+ADD_TEST(tesh-simdag-mxn-1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)
+ADD_TEST(tesh-simdag-mxn-2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)
+ADD_TEST(tesh-simdag-mxn-3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)
+ADD_TEST(tesh-simdag-par-1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh)
+ADD_TEST(tesh-simdag-par-2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh)
 
 # GRAS examples
-ADD_TEST(gras-ping-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/ping test_rl)
-ADD_TEST(gras-rpc-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/rpc test_rl)
-ADD_TEST(gras-spawn-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/spawn test_rl)
-ADD_TEST(gras-timer-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/timer test_rl)
-ADD_TEST(gras-chrono-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/chrono test_rl)
+ADD_TEST(gras-ping-rl		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/ping test_rl)
+ADD_TEST(gras-rpc-rl		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/rpc test_rl)
+ADD_TEST(gras-spawn-rl		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/spawn test_rl)
+ADD_TEST(gras-timer-rl		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/timer test_rl)
+ADD_TEST(gras-chrono-rl		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/chrono test_rl)
 ADD_TEST(gras-simple_token-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_rl)
 ADD_TEST(gras-mmrpc-rl		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/mmrpc test_rl)
 ADD_TEST(gras-all2all-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/all2all test_rl)
@@ -136,18 +118,24 @@ ADD_TEST(gras-properties-rl	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_
 ADD_TEST(msg-sendrecv_CLM03	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg sendrecv/sendrecv_CLM03.tesh)
 ADD_TEST(msg-sendrecv_Vegas	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg sendrecv/sendrecv_Vegas.tesh)
 ADD_TEST(msg-sendrecv_Reno	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg sendrecv/sendrecv_Reno.tesh)
-ADD_TEST(msg-suspend	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg suspend/suspend.tesh)
+ADD_TEST(msg-suspend		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg suspend/suspend.tesh)
 ADD_TEST(msg-masterslave	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave.tesh)
 ADD_TEST(msg-masterslave-forwarder	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_forwarder.tesh)
 ADD_TEST(msg-masterslave-failure	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_failure.tesh)
 ADD_TEST(msg-masterslave-bypass	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh)
-ADD_TEST(msg-migration	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg migration/migration.tesh)
-ADD_TEST(msg-ptask	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh)
-ADD_TEST(msg-priority	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg priority/priority.tesh)
-ADD_TEST(msg-properties	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg properties/msg_prop.tesh)
-ADD_TEST(msg-trace	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg trace/trace.tesh)
+ADD_TEST(msg-masterslave-mailbox	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh)
+ADD_TEST(msg-migration		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg migration/migration.tesh)
+ADD_TEST(msg-ptask		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh)
+ADD_TEST(msg-priority		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg priority/priority.tesh)
+ADD_TEST(msg-properties		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg properties/msg_prop.tesh)
+ADD_TEST(msg-trace		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg trace/trace.tesh)
 ADD_TEST(msg-masterslave_cpu_ti	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh)
 
+IF(HAVE_TRACING)
+  ADD_TEST(tracing-ms ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg tracing/ms.tesh)
+ENDIF(HAVE_TRACING)
+
+
 IF(${ARCH_32_BITS})
   ADD_TEST(gras-ping-sg-32	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/ping test_sg_32)
   ADD_TEST(gras-rpc-sg-32	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/rpc test_sg_32)
@@ -190,6 +178,32 @@ ADD_TEST(simdag-test_simdag2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT
 ADD_TEST(simdag-test_prop	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag properties/test_prop.tesh)
 ADD_TEST(simdag-metaxml_test	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)
 
+# smpi examples
+ADD_TEST(smpi-bcast 	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/smpi bcast.tesh)
+ADD_TEST(smpi-reduce 	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/smpi reduce.tesh)
+
+if(HAVE_GTNETS)
+ADD_TEST(msg-gtnets-waxman	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh)
+ADD_TEST(msg-gtnets-dogbone	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh)
+ADD_TEST(msg-gtnets-onelink	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-gtnets.tesh)
+ADD_TEST(msg-gtnets-dogbone-lv08	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-lv08.tesh)
+ADD_TEST(msg-gtnets-onelink-lv08	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh)
+endif(HAVE_GTNETS)
+
+# Lua examples
+if(HAVE_LUA)
+ADD_TEST(lua-masterslave	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh)
+ADD_TEST(lua-mult_matrix	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh)
+endif(HAVE_LUA)
+
+# Ruby examples
+if(HAVE_RUBY)
+ADD_TEST(ruby-masterslave	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/ruby MasterSlave.tesh)
+ADD_TEST(ruby-ping_pong		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/ruby PingPong.tesh)
+ADD_TEST(ruby-quicksort		${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/ruby Quicksort.tesh)
+endif(HAVE_RUBY)
+# END TESH TESTS
+
 if(HAVE_JAVA)
 # java examples
 ADD_TEST(java-basic 	${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest)
@@ -197,17 +211,6 @@ ADD_TEST(java-pingpong 	${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PRO
 ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest)
 ADD_TEST(java-suspend 	${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest)
 endif(HAVE_JAVA)
-# smpi examples
-ADD_TEST(smpi-bcast 	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/smpi bcast.tesh)
-ADD_TEST(smpi-reduce 	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/smpi reduce.tesh)
-
-if(HAVE_GTNETS)
-ADD_TEST(msg-gtnets1	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh)
-ADD_TEST(msg-gtnets2	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh)
-ADD_TEST(msg-gtnets3	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-gtnets.tesh)
-ADD_TEST(msg-gtnets4	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-lv08.tesh)
-ADD_TEST(msg-gtnets5	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh)
-endif(HAVE_GTNETS)
 
 ###
 ### Declare that we know that some tests are broken
@@ -225,8 +228,28 @@ set_tests_properties(tesh-gras-dd-r_big32_2 PROPERTIES WILL_FAIL true)
 set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true)   
 set_tests_properties(tesh-simdag-flatifier PROPERTIES WILL_FAIL true)
 
-# Due to LD_LIBRARY_PATH not set for lgtnets
-if(HAVE_GTNETS)
-set_tests_properties(smpi-bcast PROPERTIES WILL_FAIL true)   
-set_tests_properties(smpi-reduce PROPERTIES WILL_FAIL true)
-endif(HAVE_GTNETS)
+if(HAVE_RUBY)
+set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true)
+endif(HAVE_RUBY)
+endif(NOT enable_memcheck)
+
+# 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-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-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(testall		${PROJECT_DIRECTORY}/src/testall)
+
+if(enable_memcheck)
+	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt)
+endif(enable_memcheck)