Restructure teshsuite xbt

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index e357023..c5704ba 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -89,16 +89,16 @@ if(NOT enable_memcheck)
   ADD_TEST(help-models                           ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-models)
 
   # teshsuite/xbt
-  ADD_TESH(xbt-log-large                         --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large_test.tesh)
-  ADD_TESH(xbt-log-parallel                      --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log_crashtest.tesh)
+  ADD_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(xbt-log-parallel                      --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parallel_log --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log parallel_log_crashtest.tesh)
   IF(HAVE_MMALLOC)
     IF(${ARCH_32_BITS})
-      ADD_TESH(xbt-mmalloc-32                    --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc_32.tesh)
+      ADD_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(xbt-mmalloc-64                    --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc_64.tesh)
+      ADD_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(xbt-parmap                            --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_test.tesh)
+  ADD_TESH(xbt-parmap                            --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parmap_test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_test parmap_test.tesh)
 
   # BEGIN CONTEXTS FACTORY
   if(HAVE_RAWCTX)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 2fe8040..18b93c9 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1047,11 +1047,14 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/surf/maxmin_bench/CMakeLists.txt
   teshsuite/surf/surf_usage/CMakeLists.txt
   teshsuite/surf/trace_usage/CMakeLists.txt
-  teshsuite/xbt/CMakeLists.txt
   teshsuite/xbt/graphxml_usage/CMakeLists.txt
   teshsuite/xbt/heap_bench/CMakeLists.txt
+  teshsuite/xbt/log_large/CMakeLists.txt
   teshsuite/xbt/log_usage/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
   )
 
 set(TOOLS_CMAKEFILES_TXT

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index 12e5b57..21d0a5b 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -136,11 +136,14 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/trace_usage)
 
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/graphxml_usage)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/heap_bench)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_usage)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_test)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator)

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
deleted file mode 100644 (file)
index a7e9235..0000000
--- a/teshsuite/xbt/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-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_MMALLOC)
-  add_executable(mmalloc_test mmalloc_test.c)
-endif()
-add_executable(parmap_test parmap_test.c)
-
-
-### Add definitions for compile
-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
-  ${xml_files}
-  PARENT_SCOPE
-  )
-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
-  ${bin_files}
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE
-  )

diff --git a/teshsuite/xbt/log_large/CMakeLists.txt b/teshsuite/xbt/log_large/CMakeLists.txt
new file mode 100644 (file)
index 0000000..120c864
--- /dev/null
+++ b/teshsuite/xbt/log_large/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(log_large_test log_large_test.c)
+
+### Add definitions for compile
+target_link_libraries(log_large_test simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

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

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

diff --git a/teshsuite/xbt/mmalloc/CMakeLists.txt b/teshsuite/xbt/mmalloc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..729cb04
--- /dev/null
+++ b/teshsuite/xbt/mmalloc/CMakeLists.txt
@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+if(HAVE_MMALLOC)
+  add_executable(mmalloc_test mmalloc_test.c)
+  target_link_libraries(mmalloc_test simgrid)
+endif()
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_64.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_32.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_test.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

diff --git a/teshsuite/xbt/mmalloc_32.tesh b/teshsuite/xbt/mmalloc/mmalloc_32.tesh
similarity index 98%
rename from teshsuite/xbt/mmalloc_32.tesh
rename to teshsuite/xbt/mmalloc/mmalloc_32.tesh
index b64d9ec..449049d 100644 (file)
--- a/teshsuite/xbt/mmalloc_32.tesh
+++ b/teshsuite/xbt/mmalloc/mmalloc_32.tesh
@@ -1,4 +1,4 @@
-$ ./xbt/mmalloc_test --log=root.fmt:%m%n
+$ ${bindir:=.}/mmalloc_test --log=root.fmt:%m%n
 > Allocating a new heap
 > HeapA allocated
 > 100 bytes allocated with offset 45000

diff --git a/teshsuite/xbt/mmalloc_64.tesh b/teshsuite/xbt/mmalloc/mmalloc_64.tesh
similarity index 98%
rename from teshsuite/xbt/mmalloc_64.tesh
rename to teshsuite/xbt/mmalloc/mmalloc_64.tesh
index 83108e6..343e2a4 100644 (file)
--- a/teshsuite/xbt/mmalloc_64.tesh
+++ b/teshsuite/xbt/mmalloc/mmalloc_64.tesh
@@ -1,4 +1,4 @@
-$ ./xbt/mmalloc_test --log=root.fmt:%m%n
+$ ${bindir:=.}/mmalloc_test --log=root.fmt:%m%n
 > Allocating a new heap
 > HeapA allocated
 > 100 bytes allocated with offset 39000

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

diff --git a/teshsuite/xbt/parallel_log/CMakeLists.txt b/teshsuite/xbt/parallel_log/CMakeLists.txt
new file mode 100644 (file)
index 0000000..069181a
--- /dev/null
+++ b/teshsuite/xbt/parallel_log/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(parallel_log_crashtest parallel_log_crashtest.c)
+
+### Add definitions for compile
+target_link_libraries(parallel_log_crashtest simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

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

diff --git a/teshsuite/xbt/parallel_log_crashtest.tesh b/teshsuite/xbt/parallel_log/parallel_log_crashtest.tesh
similarity index 99%
rename from teshsuite/xbt/parallel_log_crashtest.tesh
rename to teshsuite/xbt/parallel_log/parallel_log_crashtest.tesh
index cb7605e..5715e7e 100644 (file)
--- a/teshsuite/xbt/parallel_log_crashtest.tesh
+++ b/teshsuite/xbt/parallel_log/parallel_log_crashtest.tesh
@@ -1,7 +1,7 @@
 
 ! timeout 20
 p Try to crash the log mecanism by using it in parallel with a lot of threads
-$ xbt/parallel_log_crashtest "--log=root.fmt:%m%n"
+$ ${bindir:=.}/parallel_log_crashtest "--log=root.fmt:%m%n"
 > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)
 > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)
 > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)

diff --git a/teshsuite/xbt/parmap_test/CMakeLists.txt b/teshsuite/xbt/parmap_test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1f8d63d
--- /dev/null
+++ b/teshsuite/xbt/parmap_test/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(parmap_test parmap_test.c)
+
+### Add definitions for compile
+target_link_libraries(parmap_test simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_test.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_test.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

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

diff --git a/teshsuite/xbt/parmap_test.tesh b/teshsuite/xbt/parmap_test/parmap_test.tesh
similarity index 77%
rename from teshsuite/xbt/parmap_test.tesh
rename to teshsuite/xbt/parmap_test/parmap_test.tesh
index 2b85ff6..d389a73 100644 (file)
--- a/teshsuite/xbt/parmap_test.tesh
+++ b/teshsuite/xbt/parmap_test/parmap_test.tesh
@@ -1,5 +1,5 @@
 ! timeout 120
-$ ./xbt/parmap_test --log=root.fmt:%m%n
+$ ${bindir:=.}/parmap_test --log=root.fmt:%m%n
 > Basic testing posix
 > Basic testing futex
 > Basic testing busy wait

diff --git a/teshsuite/xbt/xbt.tesh b/teshsuite/xbt/xbt.tesh
deleted file mode 100644 (file)
index 23c9533..0000000
--- a/teshsuite/xbt/xbt.tesh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! ./tesh
-
-# Description of this tesh file
-! D This tesh file contains all the tesh files relative with the xbt framework
-
-! include parallel_log_crashtest.tesh