From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 21 Jan 2019 14:58:05 +0000 (+0100)
Subject: Simplify by using set_tesh_properties().
X-Git-Tag: v3_22~513
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fcf00d5c7934678cd82177903a46fe8bfd56ff56?hp=e6b90556037db15f64d05921eb05de9a4e625f9d

Simplify by using set_tesh_properties().
---

diff --git a/teshsuite/simix/CMakeLists.txt b/teshsuite/simix/CMakeLists.txt
index 2af3e96212..26919a1b6c 100644
--- a/teshsuite/simix/CMakeLists.txt
+++ b/teshsuite/simix/CMakeLists.txt
@@ -28,6 +28,9 @@ ENDIF()
 
 if (NOT enable_memcheck AND NOT enable_address_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 (release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
+    SET_TESH_PROPERTIES(stack-overflow "ucontext;raw;boost" WILL_FAIL true)
+  endif()
 endif()
 if (NOT enable_memcheck)
   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)
@@ -35,10 +38,8 @@ endif()
 
 foreach (factory raw thread boost ucontext)
   string (TOUPPER have_${factory}_contexts VARNAME)
-  if (release AND ${VARNAME} AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
-    SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true)
-  endif()
   if (${factory} STREQUAL "thread" OR ${VARNAME})
+    # Cannot use ADD_TESH() here since ${factory} is part of the tesh filename
     ADD_TESH(tesh-simix-factory-${factory} --cfg contexts/factory:${factory} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-defaults factory_${factory}.tesh)
   endif()
 endforeach()