From f9c51ec738ba10666fb0b5c79b23fb19c80aaae7 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 8 Oct 2016 23:37:40 +0200 Subject: [PATCH] disable the maestro-set test on windows, nobody will ever use it there --- examples/msg/CMakeLists.txt | 6 +++++- src/simix/smx_global.cpp | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index f249cdcfd5..0e2ef40892 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -115,7 +115,11 @@ ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread;ucontext;raw" --c ADD_TESH_FACTORIES(msg-energy-pstate-ptask "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh) ADD_TESH_FACTORIES(msg-energy-consumption-ptask "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh) ADD_TESH_FACTORIES(msg-energy-ptask "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh) -ADD_TESH_FACTORIES(msg-maestro-set "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/maestro-set/maestro-set.tesh) +if(NOT WIN32) + ADD_TESH_FACTORIES(msg-maestro-set "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/maestro-set/maestro-set.tesh) +else() + message("Test maestro-set disabled on windows: this feature is not working") +endif() ADD_TESH_FACTORIES(app-masterworker-multicore "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-multicore.tesh) ADD_TESH_FACTORIES(app-masterworker-vivaldi "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh) diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 3ed4bf452f..bfb56d5f0f 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -176,6 +176,9 @@ XBT_PUBLIC(void) set_maestro(std::function code) void SIMIX_set_maestro(void (*code)(void*), void* data) { +#ifdef _WIN32 + INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if you need that feature"); +#endif maestro_code = std::bind(code, data); } -- 2.20.1