Move mc testsuite to teshsuite

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 239da87..9b93dba 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -510,8 +510,8 @@ ADD_TESH(test-surf-usage                         --setenv bindir=${CMAKE_BINARY_
 ADD_TESH(test-surf-trace                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/trace_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ trace_usage/trace_usage.tesh)
 
 if(HAVE_MC)
-  add_test(mc-dwarf                             ${CMAKE_BINARY_DIR}/testsuite/mc/dwarf)
-  add_test(mc-dwarf-expression                  ${CMAKE_BINARY_DIR}/testsuite/mc/dwarf-expression)
+  ADD_TESH(mc-dwarf                              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf dwarf.tesh)
+  ADD_TESH(mc-dwarf-expression                   --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf_expression --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf_expression dwarf_expression.tesh)
 endif()
 
 add_test(testall                                ${CMAKE_BINARY_DIR}/src/testall)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 63d596e..c27bd0f 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1000,6 +1000,8 @@ set(EXAMPLES_CMAKEFILES_TXT
 
 set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/bug-17132/CMakeLists.txt
+  teshsuite/mc/dwarf
+  teshsuite/mc/dwarf_expression
   teshsuite/msg/CMakeLists.txt
   teshsuite/msg/get_sender/CMakeLists.txt
   teshsuite/msg/host_on_off/CMakeLists.txt

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index f7d80b9..12e5b57 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -80,6 +80,9 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f90)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/xbt)
 
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf_expression)
+
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off)
@@ -139,8 +142,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/heap_bench)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_usage)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench)
 
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/mc)
-
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)

diff --git a/teshsuite/mc/dwarf/CMakeLists.txt b/teshsuite/mc/dwarf/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5941009
--- /dev/null
+++ b/teshsuite/mc/dwarf/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.6)
+
+if(HAVE_MC)
+  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+  add_executable(dwarf dwarf.c)
+  target_link_libraries(dwarf simgrid)
+endif()
+
+set(testsuite_src
+  ${testsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dwarf.c
+  PARENT_SCOPE
+  )

diff --git a/testsuite/mc/dwarf.c b/teshsuite/mc/dwarf/dwarf.c
similarity index 100%
rename from testsuite/mc/dwarf.c
rename to teshsuite/mc/dwarf/dwarf.c

diff --git a/teshsuite/mc/dwarf/dwarf.tesh b/teshsuite/mc/dwarf/dwarf.tesh
new file mode 100644 (file)
index 0000000..93e284b
--- /dev/null
+++ b/teshsuite/mc/dwarf/dwarf.tesh
@@ -0,0 +1,5 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/dwarf
+> [0.000000] [mc_global/INFO] Get debug information ...
+> [0.000000] [mc_global/INFO] Get debug information done !

diff --git a/testsuite/mc/CMakeLists.txt b/teshsuite/mc/dwarf_expression/CMakeLists.txt
similarity index 75%
rename from testsuite/mc/CMakeLists.txt
rename to teshsuite/mc/dwarf_expression/CMakeLists.txt
index df0bc0b..e0d7c2c 100644 (file)
--- a/testsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/dwarf_expression/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 
 if(HAVE_MC)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  add_executable(dwarf dwarf.c)
-  target_link_libraries(dwarf simgrid)
 
   add_executable(dwarf-expression dwarf_expression.c)
   target_link_libraries(dwarf-expression simgrid)
@@ -11,7 +9,6 @@ endif()
 
 set(testsuite_src
   ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/dwarf.c
   ${CMAKE_CURRENT_SOURCE_DIR}/dwarf_expression.c
   PARENT_SCOPE
   )

diff --git a/testsuite/mc/dwarf_expression.c b/teshsuite/mc/dwarf_expression/dwarf_expression.c
similarity index 100%
rename from testsuite/mc/dwarf_expression.c
rename to teshsuite/mc/dwarf_expression/dwarf_expression.c

diff --git a/teshsuite/mc/dwarf_expression/dwarf_expression.tesh b/teshsuite/mc/dwarf_expression/dwarf_expression.tesh
new file mode 100644 (file)
index 0000000..b87a850
--- /dev/null
+++ b/teshsuite/mc/dwarf_expression/dwarf_expression.tesh
@@ -0,0 +1,4 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/dwarf-expression
+>