Restructure teshsuite simix

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index c5704ba..c27f1fa 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -102,18 +102,18 @@ if(NOT enable_memcheck)
 
   # BEGIN CONTEXTS FACTORY
   if(HAVE_RAWCTX)
-    ADD_TEST(simix-factory-default              ${TESH_COMMAND} ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/factory_raw.tesh)
+    ADD_TESH(simix-factory-default              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_raw.tesh)
   elseif(CONTEXT_UCONTEXT)
-    ADD_TEST(simix-factory-default              ${TESH_COMMAND} ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/factory_ucontext.tesh)
+    ADD_TESH(simix-factory-default              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_ucontext.tesh)
   else()
-    ADD_TEST(simix-factory-default              ${TESH_COMMAND} ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/factory_thread.tesh)
+    ADD_TESH(simix-factory-default              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_thread.tesh)
   endif()
-  ADD_TEST(simix-factory-thread                 ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/factory_thread.tesh)
+  ADD_TESH(simix-factory-thread                 --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_thread.tesh)
   if(HAVE_RAWCTX)
-    ADD_TEST(simix-factory-raw                  ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/factory_raw.tesh)
+    ADD_TESH(simix-factory-raw                  --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_raw.tesh)
   endif()
   if(CONTEXT_UCONTEXT)
-    ADD_TEST(simix-factory-ucontext             ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/factory_ucontext.tesh)
+    ADD_TESH(simix-factory-ucontext             --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_ucontext.tesh)
   endif()
 
   # these tests need the assertion mechanism
@@ -461,7 +461,7 @@ if(NOT enable_memcheck)
     ADD_TESH(scala-masterslave                   --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/scala --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/scala ${CMAKE_HOME_DIRECTORY}/examples/scala/masterslave/masterslave.tesh)
   endif()
 
-  ADD_TESH_FACTORIES(stack-overflow              "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow.tesh)
+  ADD_TESH_FACTORIES(stack-overflow              "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack_overflow --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow stack_overflow.tesh)
 
   # examples/msg/mc
   if(HAVE_MC)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 18b93c9..6fc11ab 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1018,7 +1018,8 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt
-  teshsuite/simix/CMakeLists.txt
+  teshsuite/simix/check_defaults/CMakeLists.txt
+  teshsuite/simix/stack_overflow/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index 21d0a5b..11296ee 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -103,7 +103,8 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132)
 
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simix)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test)

diff --git a/teshsuite/simix/CMakeLists.txt b/teshsuite/simix/check_defaults/CMakeLists.txt
similarity index 72%
rename from teshsuite/simix/CMakeLists.txt
rename to teshsuite/simix/check_defaults/CMakeLists.txt
index 8a22a1a..4c78962 100644 (file)
--- a/teshsuite/simix/CMakeLists.txt
+++ b/teshsuite/simix/check_defaults/CMakeLists.txt
@@ -5,26 +5,20 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 add_executable(check_defaults check_defaults.c)
 target_link_libraries(check_defaults simgrid)
 
-add_executable(stack_overflow stack_overflow.c)
-target_link_libraries(stack_overflow simgrid)
-
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/factory_raw.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/factory_thread.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/factory_ucontext.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.tesh
   PARENT_SCOPE
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.xml
   PARENT_SCOPE
   )
 set(teshsuite_src
   ${teshsuite_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/check_defaults.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.c
   PARENT_SCOPE
   )
 set(bin_files

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

diff --git a/teshsuite/simix/factory_raw.tesh b/teshsuite/simix/check_defaults/factory_raw.tesh
similarity index 76%
rename from teshsuite/simix/factory_raw.tesh
rename to teshsuite/simix/check_defaults/factory_raw.tesh
index 7fc2525..7cfb7c1 100644 (file)
--- a/teshsuite/simix/factory_raw.tesh
+++ b/teshsuite/simix/check_defaults/factory_raw.tesh
@@ -1,2 +1,2 @@
-$ ./simix/check_defaults
+$ ${bindir:=.}/check_defaults
 > [simix_context/VERBOSE] Using raw contexts. Because the glibc is just not good enough for us.

diff --git a/teshsuite/simix/factory_thread.tesh b/teshsuite/simix/check_defaults/factory_thread.tesh
similarity index 66%
rename from teshsuite/simix/factory_thread.tesh
rename to teshsuite/simix/check_defaults/factory_thread.tesh
index fdb9520..8acbd40 100644 (file)
--- a/teshsuite/simix/factory_thread.tesh
+++ b/teshsuite/simix/check_defaults/factory_thread.tesh
@@ -1,2 +1,2 @@
-$ ./simix/check_defaults
+$ ${bindir:=.}/check_defaults
 > [simix_context/VERBOSE] Activating thread context factory

diff --git a/teshsuite/simix/factory_ucontext.tesh b/teshsuite/simix/check_defaults/factory_ucontext.tesh
similarity index 65%
rename from teshsuite/simix/factory_ucontext.tesh
rename to teshsuite/simix/check_defaults/factory_ucontext.tesh
index bf4130a..8652bb4 100644 (file)
--- a/teshsuite/simix/factory_ucontext.tesh
+++ b/teshsuite/simix/check_defaults/factory_ucontext.tesh
@@ -1,2 +1,2 @@
-$ ./simix/check_defaults
+$ ${bindir:=.}/check_defaults
 > [simix_context/VERBOSE] Activating SYSV context factory

diff --git a/teshsuite/simix/stack_overflow/CMakeLists.txt b/teshsuite/simix/stack_overflow/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e039545
--- /dev/null
+++ b/teshsuite/simix/stack_overflow/CMakeLists.txt
@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(stack_overflow stack_overflow.c)
+target_link_libraries(stack_overflow simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.xml
+  PARENT_SCOPE
+  )
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

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

diff --git a/teshsuite/simix/stack_overflow.tesh b/teshsuite/simix/stack_overflow/stack_overflow.tesh
similarity index 86%
rename from teshsuite/simix/stack_overflow.tesh
rename to teshsuite/simix/stack_overflow/stack_overflow.tesh
index a0df41e..aaff9b2 100644 (file)
--- a/teshsuite/simix/stack_overflow.tesh
+++ b/teshsuite/simix/stack_overflow/stack_overflow.tesh
@@ -1,5 +1,5 @@
 ! expect signal SIGSEGV
-$ ./simix/stack_overflow --cfg=contexts/stack_size:96 ${srcdir:=.}/simix/stack_overflow.xml
+$ ${bindir:=.}/stack_overflow --cfg=contexts/stack_size:96 stack_overflow.xml
 > [Tremblay:master:(0) 0.000000] [test/INFO] Launching our nice bugged recursive function...
 > Access violation detected.
 > This can result from a programming error in your code or, although less likely,

diff --git a/teshsuite/simix/stack_overflow.xml b/teshsuite/simix/stack_overflow/stack_overflow.xml
similarity index 100%
rename from teshsuite/simix/stack_overflow.xml
rename to teshsuite/simix/stack_overflow/stack_overflow.xml