-# 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)