X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3261a9f4db993fa8854eb68bd0a2b0d7a5355480..13ee46b3a96091710df934f6af7e87170f3f2eef:/teshsuite/xbt/CMakeLists.txt?ds=sidebyside

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index 0a26855405..a7e923586f 100644
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -4,24 +4,28 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
 add_executable(log_large_test log_large_test.c)
 add_executable(parallel_log_crashtest parallel_log_crashtest.c)
-add_executable(mmalloc_test mmalloc_test.c)
+if(HAVE_MMALLOC)
+  add_executable(mmalloc_test mmalloc_test.c)
+endif()
+add_executable(parmap_test parmap_test.c)
+
 
 ### 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 )
-  target_link_libraries(mmalloc_test gras m pthread )
-else(NOT WIN32)
-  target_link_libraries(log_large_test gras)
-  target_link_libraries(parallel_log_crashtest gras)
-  target_link_libraries(mmalloc_test gras)
-endif(NOT WIN32)
+target_link_libraries(log_large_test simgrid)
+target_link_libraries(parallel_log_crashtest simgrid)
+if(HAVE_MMALLOC)
+  target_link_libraries(mmalloc_test simgrid)
+endif()
+target_link_libraries(parmap_test simgrid)
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/xbt.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_64.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_test.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -32,6 +36,8 @@ set(teshsuite_src
   ${teshsuite_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_test.c
   PARENT_SCOPE
   )
 set(bin_files