Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/.gitignore b/.gitignore
index 34a055f..b4eb310 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1020,8 +1020,7 @@ teshsuite/xbt/log_usage/log_usage
 teshsuite/xbt/mallocator/mallocator
 teshsuite/xbt/mmalloc/mmalloc_test
 teshsuite/xbt/mmalloc_test
-teshsuite/xbt/parallel_log_crashtest
-teshsuite/xbt/parallel_log/parallel_log_crashtest
+teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest
 teshsuite/xbt/parmap_bench/parmap_bench
 teshsuite/xbt/parmap_test/parmap_test
 testgraph.dot

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fd349ae
--- /dev/null
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -0,0 +1,15 @@
+foreach(x heap_bench log_large 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})
+
+    set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+    set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+endforeach()
+
+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()
+
+set(teshsuite_src ${teshsuite_src}                                             PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                PARENT_SCOPE)

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

diff --git a/teshsuite/xbt/log_large/CMakeLists.txt b/teshsuite/xbt/log_large/CMakeLists.txt
deleted file mode 100644 (file)
index 71ad5a3..0000000
--- a/teshsuite/xbt/log_large/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_executable       (log_large_test log_large_test.c)
-target_link_libraries(log_large_test simgrid)
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.c
-  PARENT_SCOPE)

diff --git a/teshsuite/xbt/log_large/log_large_test.c b/teshsuite/xbt/log_large/log_large.c
similarity index 100%
rename from teshsuite/xbt/log_large/log_large_test.c
rename to teshsuite/xbt/log_large/log_large.c

diff --git a/teshsuite/xbt/log_large/log_large_test.tesh b/teshsuite/xbt/log_large/log_large.tesh
similarity index 99%
rename from teshsuite/xbt/log_large/log_large_test.tesh
rename to teshsuite/xbt/log_large/log_large.tesh
index a53218e..182ce65 100644 (file)
--- a/teshsuite/xbt/log_large/log_large_test.tesh
+++ b/teshsuite/xbt/log_large/log_large.tesh
@@ -1,6 +1,6 @@
 
 p Check that the dynamic version of the log simple layout works
-$ $SG_EXENV_TEST ${bindir:=.}/log_large_test "--log=root.fmt:%m%n"
+$ $SG_EXENV_TEST ${bindir:=.}/log_large "--log=root.fmt:%m%n"
 > This is a very large message:
 > 0
 > 1.........1.........2.........3.........4.........5.........6.........7.........8.........9.........0
@@ -116,7 +116,7 @@ $ $SG_EXENV_TEST ${bindir:=.}/log_large_test "--log=root.fmt:%m%n"
 > Done (strlen>10210)
 
 p Check that the dynamic version of the log formatted layout works
-$ $SG_EXENV_TEST ${bindir:=.}/log_large_test "--log=root.fmt:%m%n"
+$ $SG_EXENV_TEST ${bindir:=.}/log_large "--log=root.fmt:%m%n"
 > This is a very large message:
 > 0
 > 1.........1.........2.........3.........4.........5.........6.........7.........8.........9.........0

diff --git a/teshsuite/xbt/mallocator/CMakeLists.txt b/teshsuite/xbt/mallocator/CMakeLists.txt
deleted file mode 100644 (file)
index 889c93e..0000000
--- a/teshsuite/xbt/mallocator/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_executable       (mallocator mallocator_test.c)
-target_link_libraries(mallocator simgrid)
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mallocator.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mallocator_test.c
-  PARENT_SCOPE)

diff --git a/teshsuite/xbt/mallocator/mallocator_test.c b/teshsuite/xbt/mallocator/mallocator.c
similarity index 100%
rename from teshsuite/xbt/mallocator/mallocator_test.c
rename to teshsuite/xbt/mallocator/mallocator.c

diff --git a/teshsuite/xbt/parallel_log/CMakeLists.txt b/teshsuite/xbt/parallel_log/CMakeLists.txt
deleted file mode 100644 (file)
index 8a4907a..0000000
--- a/teshsuite/xbt/parallel_log/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_executable       (parallel_log_crashtest parallel_log_crashtest.c)
-target_link_libraries(parallel_log_crashtest simgrid)
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.c
-  PARENT_SCOPE)

diff --git a/teshsuite/xbt/parallel_log/parallel_log_crashtest.c b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
similarity index 96%
rename from teshsuite/xbt/parallel_log/parallel_log_crashtest.c
rename to teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
index 81f6d45..c4aab99 100644 (file)
--- a/teshsuite/xbt/parallel_log/parallel_log_crashtest.c
+++ b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
@@ -31,8 +31,7 @@ static void* crasher_thread(void *arg)
   return NULL;
 }
 
-int crasher(int argc, char *argv[]);
-int crasher(int argc, char *argv[])
+static int crasher(int argc, char *argv[])
 {
   int i;
   xbt_os_thread_t *crashers;

diff --git a/teshsuite/xbt/parallel_log/parallel_log_crashtest.tesh b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.tesh
similarity index 100%
rename from teshsuite/xbt/parallel_log/parallel_log_crashtest.tesh
rename to teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.tesh

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

diff --git a/teshsuite/xbt/parmap_test/CMakeLists.txt b/teshsuite/xbt/parmap_test/CMakeLists.txt
deleted file mode 100644 (file)
index 2301a0c..0000000
--- a/teshsuite/xbt/parmap_test/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_executable       (parmap_test parmap_test.c)
-target_link_libraries(parmap_test simgrid)
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_test.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_test.c
-  PARENT_SCOPE)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 03265d6..e0134f6 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1100,14 +1100,9 @@ set(CMAKEFILES_TXT
   teshsuite/surf/surf_usage/CMakeLists.txt
   teshsuite/surf/trace_usage/CMakeLists.txt
   
-  teshsuite/xbt/heap_bench/CMakeLists.txt
-  teshsuite/xbt/log_large/CMakeLists.txt
+  teshsuite/xbt/CMakeLists.txt
   teshsuite/xbt/log_usage/CMakeLists.txt
-  teshsuite/xbt/mallocator/CMakeLists.txt
   teshsuite/xbt/mmalloc/CMakeLists.txt
-  teshsuite/xbt/parallel_log/CMakeLists.txt
-  teshsuite/xbt/parmap_bench/CMakeLists.txt
-  teshsuite/xbt/parmap_test/CMakeLists.txt
 
   tools/CMakeLists.txt
   tools/graphicator/CMakeLists.txt

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 14da841..4f5d25d 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -153,9 +153,6 @@ IF(NOT enable_memcheck)
 
   ### XBT ###
   # BEGIN TESH TESTS
-  ADD_TESH(tesh-xbt-log-large                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/log_large --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large log_large_test.tesh)
-  ADD_TESH(tesh-xbt-log-parallel                 --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parallel_log --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log parallel_log_crashtest.tesh)
-#  ADD_TESH(tesh-xbt-mallocator                  --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/mallocator --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mallocator mallocator.tesh)
   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)
@@ -163,14 +160,11 @@ IF(NOT enable_memcheck)
       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()
-  ADD_TESH(tesh-xbt-parmap                       --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parmap_test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_test parmap_test.tesh)
   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()
-  ADD_TESH(tesh-xbt-heap                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/heap_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/heap_bench heap_bench.tesh)
-  #ADD_TESH(test-xbt-parmap                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parmap_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench parmap_bench.tesh)
   # END TESH TESTS
 
   ## INTERFACES ##