X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e89f8b28cd1ead75b73d8e18de33510f00e28b11..cce6ab4f4fb2bbc73b9d440c72ded7eb9be95f3d:/teshsuite/kernel/CMakeLists.txt

diff --git a/teshsuite/kernel/CMakeLists.txt b/teshsuite/kernel/CMakeLists.txt
index 0fe984b1de..4890b521d9 100644
--- a/teshsuite/kernel/CMakeLists.txt
+++ b/teshsuite/kernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(x context-stacksize)
+foreach(x context-defaults)
   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,31 @@ foreach(x context-stacksize)
   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)
+endforeach()
+
 ## Add the tests.
 ## Some need to be run with all factories, some don't need tesh to run
 
-# This test should not be executed with thread contexts, as they ignore stack size changes
-ADD_TESH_FACTORIES(tesh-kern-context-stacksize "raw;boost;ucontext" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/kernel/context-stacksize --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/context-stacksize --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/teshsuite/kernel/context-stacksize ${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/context-stacksize/context-stacksize.tesh)
-set(tesh_files    ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/context-stacksize/context-stacksize.tesh)
-
+# 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)
+ELSEIF(HAVE_UCONTEXT_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_ucontext.tesh)
+ELSEIF(HAVE_BOOST_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_boost.tesh)
+ELSE()
+  ADD_TESH(tesh-kernel-context-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/kernel/context-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/context-defaults factory_thread.tesh)
+ENDIF()
+# Ensure that we get what we want when specifying the context factory on the command line
+foreach (factory raw thread boost ucontext)
+  string (TOUPPER have_${factory}_contexts VARNAME)
+  if (${factory} STREQUAL "thread" OR ${VARNAME})
+    # Cannot use ADD_TESH() here since ${factory} is part of the tesh filename
+    ADD_TESH(tesh-kernel-factory-${factory} --cfg contexts/factory:${factory} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/kernel/context-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/kernel/context-defaults factory_${factory}.tesh)
+  endif()
+endforeach()
 
 
 # Pack the files in the archive