From 7cdbe5b848fd1f600182c38fcd1b7268130dc9c9 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 8 Mar 2016 13:27:09 +0100
Subject: [PATCH] set will fail property for stack overoflow on win and osx

---
 teshsuite/simix/stack_overflow/CMakeLists.txt |  9 +++++++++
 tools/cmake/Tests.cmake                       | 19 -------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/teshsuite/simix/stack_overflow/CMakeLists.txt b/teshsuite/simix/stack_overflow/CMakeLists.txt
index edbbb81e2f..fa7c409607 100644
--- a/teshsuite/simix/stack_overflow/CMakeLists.txt
+++ b/teshsuite/simix/stack_overflow/CMakeLists.txt
@@ -1,6 +1,15 @@
 add_executable       (stack_overflow stack_overflow.c)
 target_link_libraries(stack_overflow simgrid)
 
+if(release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
+  foreach (factory raw thread ucontext)
+    string (TOUPPER have_${factory}_contexts VARNAME)
+    if (${VARNAME})
+      SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true)
+    endif()
+  endforeach()
+endif()
+
 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)
 
 set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.tesh          PARENT_SCOPE)
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index d158cacedf..f38f2ee2db 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -83,25 +83,6 @@ IF(NOT enable_memcheck)
     ENDIF()
   ENDIF()
 
-  ###
-  ### Declare that we know that some tests are broken
-  ###
-  IF(release)
-    IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin")
-      # These tests are known to fail on Windows and Mac OS X
-      # (the expected error message is not shown).
-      IF(HAVE_THREAD_CONTEXTS)
-      SET_TESTS_PROPERTIES(stack-overflow-thread PROPERTIES WILL_FAIL true)
-      ENDIF()
-      IF(HAVE_UCONTEXT_CONTEXTS)
-        SET_TESTS_PROPERTIES(stack-overflow-ucontext PROPERTIES WILL_FAIL true)
-      ENDIF()
-      IF(HAVE_RAW_CONTEXTS)
-        SET_TESTS_PROPERTIES(stack-overflow-raw PROPERTIES WILL_FAIL true)
-      ENDIF()
-    ENDIF()
-  ENDIF()
-
   ## INTERFACES ##
   ### SIMDAG ###
   # BEGIN TESH TESTS
-- 
2.20.1