Revert "[mmalloc] Use mremap to expand heaps (heap collision prevention)"

[simgrid.git] / teshsuite / xbt / CMakeLists.txt

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index a4a7eb3..a7e9235 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -4,24 +4,19 @@ 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)
-if(HAVE_MMAP)
+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 )
-  if(HAVE_MMAP)
-    target_link_libraries(mmalloc_test gras m pthread )
-  endif()
-else()
-  target_link_libraries(log_large_test gras)
-  target_link_libraries(parallel_log_crashtest gras)
-  if(HAVE_MMAP)
-    target_link_libraries(mmalloc_test gras)
-  endif()
+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}
@@ -30,6 +25,7 @@ set(tesh_files
   ${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
@@ -41,6 +37,7 @@ set(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