From 34bf72098349791f03e165b1f8fa348aa783b9cc Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 2 Mar 2016 00:18:23 +0100 Subject: [PATCH] make test pass with make distcheck too + do not add bug-17132 is smpi is not enabled + use root + path in listen async (out-of-source?) --- teshsuite/bug-17132/CMakeLists.txt | 3 ++- teshsuite/msg/listen_async/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt index 510f29702d..a3058501d3 100644 --- a/teshsuite/bug-17132/CMakeLists.txt +++ b/teshsuite/bug-17132/CMakeLists.txt @@ -8,6 +8,8 @@ if(enable_smpi) add_executable (bug-17132 bug-17132.c) target_link_libraries(bug-17132 simgrid) + + ADD_TESH_FACTORIES(tesh-smpi-bug-17132 "thread" --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR} --cd ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/bug-17132.tesh) endif(enable_smpi) set(tesh_files @@ -23,4 +25,3 @@ set(txt_files ${CMAKE_CURRENT_SOURCE_DIR}/hostfile.txt PARENT_SCOPE) -ADD_TESH_FACTORIES(tesh-smpi-bug-17132 "thread" --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR} --cd ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/bug-17132.tesh) diff --git a/teshsuite/msg/listen_async/CMakeLists.txt b/teshsuite/msg/listen_async/CMakeLists.txt index 8749c404ed..ebb9a728a1 100644 --- a/teshsuite/msg/listen_async/CMakeLists.txt +++ b/teshsuite/msg/listen_async/CMakeLists.txt @@ -4,4 +4,4 @@ target_link_libraries(listen_async simgrid) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/listen_async.tesh PARENT_SCOPE) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/listen_async.c PARENT_SCOPE) -ADD_TESH_FACTORIES(tesh-msg-listen-async "thread;ucontext;raw" --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR} --cd ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/listen_async.tesh) +ADD_TESH_FACTORIES(tesh-msg-listen-async "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/listen_async --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/listen_async/ ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/listen_async/listen_async.tesh) -- 2.20.1