-### Add definitions for compile
-if(NOT WIN32)
- target_link_libraries(log_large_test gras m pthread )
- target_link_libraries(parallel_log_crashtest gras m pthread )
- if(HAVE_MMAP)
- target_link_libraries(mmalloc_test gras m pthread )
- 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.cpp PARENT_SCOPE)
+
+foreach(x heap_bench log_large parallel_log_crashtest parmap_test) #mallocator parmap_bench
+ ADD_TESH(tesh-xbt-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/${x} ${x}.tesh)
+endforeach()
+
+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)