From d417954d024c18377e7fb21d670e59f324ccfc36 Mon Sep 17 00:00:00 2001 From: degomme Date: Mon, 21 Mar 2016 17:06:17 +0100 Subject: [PATCH 1/1] Move this bit after the definition of the tests it relates to --- teshsuite/simix/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/teshsuite/simix/CMakeLists.txt b/teshsuite/simix/CMakeLists.txt index a435137ae4..74368523c0 100644 --- a/teshsuite/simix/CMakeLists.txt +++ b/teshsuite/simix/CMakeLists.txt @@ -8,11 +8,7 @@ endforeach() foreach (factory raw thread boost ucontext) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/check_defaults/factory_${factory}.tesh) - string (TOUPPER have_${factory}_contexts VARNAME) - if (${VARNAME} AND release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin")) - SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true) - endif() if (${VARNAME}) 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() @@ -30,5 +26,11 @@ ENDIF() ADD_TESH_FACTORIES(stack-overflow "thread;ucontext;raw" --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 (${VARNAME} AND release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin")) + foreach (factory raw thread ucontext) + SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true) + endforeach() +endif() + set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow/stack_overflow.tesh PARENT_SCOPE) -- 2.20.1