no more xbt in Tests.cmake

  everything is now in teshsuite/xbt/*/CMakeLists.txt

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index fd349ae..726a6fc 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(x heap_bench log_large mallocator parallel_log_crashtest parmap_bench parmap_test)
+foreach(x heap_bench log_large log_usage mallocator parallel_log_crashtest parmap_bench parmap_test)
     add_executable       (${x}  ${x}/${x}.c)
     target_link_libraries(${x}  simgrid)
     set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -11,5 +11,9 @@ foreach(x heap_bench log_large parallel_log_crashtest parmap_test) #mallocator p
     ADD_TESH(tesh-xbt-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/${x} ${x}.tesh)
 endforeach()
 
-set(teshsuite_src ${teshsuite_src}                                             PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                PARENT_SCOPE)
+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)
+endif()
+
+set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/log_usage/log_usage_ndebug.tesh  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                                 PARENT_SCOPE)

diff --git a/teshsuite/xbt/log_usage/CMakeLists.txt b/teshsuite/xbt/log_usage/CMakeLists.txt
deleted file mode 100644 (file)
index 5f56e30..0000000
--- a/teshsuite/xbt/log_usage/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_executable       (log_usage log_usage.c)
-target_link_libraries(log_usage simgrid)
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/log_usage.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/log_usage_ndebug.tesh
-  PARENT_SCOPE)
-set(testsuite_src
-  ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/log_usage.c
-  PARENT_SCOPE)

diff --git a/teshsuite/xbt/mmalloc/CMakeLists.txt b/teshsuite/xbt/mmalloc/CMakeLists.txt
index e288687..90f0889 100644 (file)
--- a/teshsuite/xbt/mmalloc/CMakeLists.txt
+++ b/teshsuite/xbt/mmalloc/CMakeLists.txt
@@ -1,14 +1,13 @@
 if(HAVE_MMALLOC)
   add_executable       (mmalloc_test mmalloc_test.c)
   target_link_libraries(mmalloc_test simgrid)
+  if(${ARCH_32_BITS})
+    ADD_TESH(tesh-xbt-mmalloc-32 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_32.tesh)
+  else()
+    ADD_TESH(tesh-xbt-mmalloc-64 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_64.tesh)
+  endif()
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_64.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_32.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_test.c
-  PARENT_SCOPE)
+set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_64.tesh
+                                     ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_32.tesh  PARENT_SCOPE)
+set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_test.c   PARENT_SCOPE)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 3f3c80d..4f190d9 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1088,7 +1088,6 @@ set(CMAKEFILES_TXT
   teshsuite/surf/trace_usage/CMakeLists.txt
   
   teshsuite/xbt/CMakeLists.txt
-  teshsuite/xbt/log_usage/CMakeLists.txt
   teshsuite/xbt/mmalloc/CMakeLists.txt
 
   tools/CMakeLists.txt

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 388d167..a006bd2 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -125,22 +125,6 @@ IF(NOT enable_memcheck)
     ENDIF()
   ENDIF()
 
-  ### XBT ###
-  # BEGIN TESH TESTS
-  IF(HAVE_MMALLOC)
-    IF(${ARCH_32_BITS})
-      ADD_TESH(tesh-xbt-mmalloc-32               --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_32.tesh)
-    ELSE()
-      ADD_TESH(tesh-xbt-mmalloc-64               --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc mmalloc_64.tesh)
-    ENDIF()
-  ENDIF()
-  IF(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.tesh)
-  ELSE()
-    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)
-  ENDIF()
-  # END TESH TESTS
-
   ## INTERFACES ##
   ### MSG ###
   # BEGIN TESH TESTS