group some internal tests together

diff --git a/MANIFEST.in b/MANIFEST.in
index 4c4ef04..0f3f90c 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -656,6 +656,10 @@ include teshsuite/kernel/context-defaults/factory_boost.tesh
 include teshsuite/kernel/context-defaults/factory_raw.tesh
 include teshsuite/kernel/context-defaults/factory_thread.tesh
 include teshsuite/kernel/context-defaults/factory_ucontext.tesh
+include teshsuite/kernel/simcall-generic/simcall-generic.cpp
+include teshsuite/kernel/simcall-generic/simcall-generic.tesh
+include teshsuite/kernel/stack-overflow/stack-overflow.cpp
+include teshsuite/kernel/stack-overflow/stack-overflow.tesh
 include teshsuite/mc/dwarf-expression/dwarf-expression.cpp
 include teshsuite/mc/dwarf-expression/dwarf-expression.tesh
 include teshsuite/mc/dwarf/dwarf.cpp
@@ -819,10 +823,6 @@ include teshsuite/simdag/platforms/two_clusters_router_id.xml
 include teshsuite/simdag/platforms/two_hosts_multi_hop.xml
 include teshsuite/simdag/platforms/two_hosts_one_link.xml
 include teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml
-include teshsuite/simix/generic-simcalls/generic-simcalls.cpp
-include teshsuite/simix/generic-simcalls/generic-simcalls.tesh
-include teshsuite/simix/stack-overflow/stack-overflow.cpp
-include teshsuite/simix/stack-overflow/stack-overflow.tesh
 include teshsuite/smpi/auto-shared/auto-shared.c
 include teshsuite/smpi/auto-shared/auto-shared.tesh
 include teshsuite/smpi/bug-17132/bug-17132.c
@@ -2685,7 +2685,6 @@ include teshsuite/msg/CMakeLists.txt
 include teshsuite/python/CMakeLists.txt
 include teshsuite/s4u/CMakeLists.txt
 include teshsuite/simdag/CMakeLists.txt
-include teshsuite/simix/CMakeLists.txt
 include teshsuite/smpi/CMakeLists.txt
 include teshsuite/smpi/isp/umpire/CMakeLists.txt
 include teshsuite/smpi/mpich3-test/CMakeLists.txt

diff --git a/teshsuite/kernel/CMakeLists.txt b/teshsuite/kernel/CMakeLists.txt
index 4890b52..fbcdafc 100644 (file)
--- a/teshsuite/kernel/CMakeLists.txt
+++ b/teshsuite/kernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(x context-defaults)
+foreach(x context-defaults simcall-generic stack-overflow)
   add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.cpp)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -7,13 +7,25 @@ foreach(x context-defaults)
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 
-foreach (factory raw thread boost ucontext)
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/context-defaults/factory_${factory}.tesh)
+## Add the easy tests: only simcall-generic for now
+foreach(x simcall-generic)
+  set(tesh_files    ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+  ADD_TESH(tesh-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/kernel/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/${x} ${x}.tesh)
 endforeach()
 
-## Add the tests.
-## Some need to be run with all factories, some don't need tesh to run
+## Add the tests for stack-overflow
+set(tesh_files    ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/stack-overflow/stack-overflow.tesh)
+if (NOT enable_memcheck AND NOT enable_address_sanitizer AND NOT enable_thread_sanitizer)
+  ADD_TESH_FACTORIES(stack-overflow   "ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/kernel/stack-overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/stack-overflow stack-overflow.tesh)
+  if (WIN32)
+    SET_TESH_PROPERTIES(stack-overflow "ucontext;raw;boost" WILL_FAIL true)
+  endif()
+endif()
 
+## Add the tests for context-default
+foreach (factory raw thread boost ucontext)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/context-defaults/factory_${factory}.tesh)
+endforeach()
 # Ensure that we have the right default setting for the context factory
 IF(HAVE_RAW_CONTEXTS)
   ADD_TESH(tesh-kernel-context-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/kernel/context-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/context-defaults factory_raw.tesh)

diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp b/teshsuite/kernel/simcall-generic/simcall-generic.cpp
similarity index 100%
rename from teshsuite/simix/generic-simcalls/generic-simcalls.cpp
rename to teshsuite/kernel/simcall-generic/simcall-generic.cpp

diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.tesh b/teshsuite/kernel/simcall-generic/simcall-generic.tesh
similarity index 87%
rename from teshsuite/simix/generic-simcalls/generic-simcalls.tesh
rename to teshsuite/kernel/simcall-generic/simcall-generic.tesh
index 66f0276..1a95a93 100644 (file)
--- a/teshsuite/simix/generic-simcalls/generic-simcalls.tesh
+++ b/teshsuite/kernel/simcall-generic/simcall-generic.tesh
@@ -1,6 +1,6 @@
 
 ! ignore .*Stack size modifications are ignored by thread factory.
-$ ${bindir:=.}/generic-simcalls --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
+$ ${bindir:=.}/simcall-generic --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [test/INFO] Start
 > [0.000000] [test/INFO] kernel
 > [Tremblay:master:(1) 0.000000] [test/INFO] kernel, returned

diff --git a/teshsuite/simix/stack-overflow/stack-overflow.cpp b/teshsuite/kernel/stack-overflow/stack-overflow.cpp
similarity index 100%
rename from teshsuite/simix/stack-overflow/stack-overflow.cpp
rename to teshsuite/kernel/stack-overflow/stack-overflow.cpp

diff --git a/teshsuite/simix/stack-overflow/stack-overflow.tesh b/teshsuite/kernel/stack-overflow/stack-overflow.tesh
similarity index 100%
rename from teshsuite/simix/stack-overflow/stack-overflow.tesh
rename to teshsuite/kernel/stack-overflow/stack-overflow.tesh

diff --git a/teshsuite/simix/CMakeLists.txt b/teshsuite/simix/CMakeLists.txt
deleted file mode 100644 (file)
index 8e714d3..0000000
--- a/teshsuite/simix/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-foreach(x generic-simcalls stack-overflow)
-  add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.cpp)
-  target_link_libraries(${x}  simgrid)
-  set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
-  add_dependencies(tests ${x})
-endforeach()
-
-set(teshsuite_src  ${teshsuite_src}                                                                        PARENT_SCOPE)
-set(tesh_files     ${tesh_files}     
-    ${CMAKE_CURRENT_SOURCE_DIR}/stack-overflow/stack-overflow.tesh  
-    ${CMAKE_CURRENT_SOURCE_DIR}/generic-simcalls/generic-simcalls.tesh    
-    PARENT_SCOPE)
-
-if (NOT enable_memcheck AND NOT enable_address_sanitizer AND NOT enable_thread_sanitizer)
-  ADD_TESH_FACTORIES(stack-overflow   "ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack-overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack-overflow stack-overflow.tesh)
-  if (WIN32)
-    SET_TESH_PROPERTIES(stack-overflow "ucontext;raw;boost" WILL_FAIL true)
-  endif()
-endif()
-ADD_TESH_FACTORIES(generic-simcalls "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/generic-simcalls --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/generic-simcalls generic-simcalls.tesh)
-

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 3c5ac02..4bba946 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1025,7 +1025,6 @@ set(CMAKEFILES_TXT
   teshsuite/python/CMakeLists.txt
   teshsuite/s4u/CMakeLists.txt
   teshsuite/simdag/CMakeLists.txt
-  teshsuite/simix/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt