From e9ea1cec8b4a0f945b3d05f7366147c9c33a779a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 15 Oct 2015 01:16:32 +0200 Subject: [PATCH 1/1] Fix out of sources builds --- examples/s4u/basic/s4u_basic.tesh | 2 +- examples/s4u/io/s4u_io.tesh | 2 +- tools/cmake/Tests.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/s4u/basic/s4u_basic.tesh b/examples/s4u/basic/s4u_basic.tesh index e093aa3f18..e081aa7e32 100644 --- a/examples/s4u/basic/s4u_basic.tesh +++ b/examples/s4u/basic/s4u_basic.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ $SG_TEST_EXENV ./s4u_basic +$ $SG_TEST_EXENV ${bindir:=.}/s4u_basic > [host0:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to serve > [host1:master:(0) 0.000000] [s4u_test/INFO] Hello s4u, I have something to send > [host0:worker:(0) 0.001301] [s4u_test/INFO] I received 'GaBuZoMeu' diff --git a/examples/s4u/io/s4u_io.tesh b/examples/s4u/io/s4u_io.tesh index 38d673c5c5..7557d493d8 100644 --- a/examples/s4u/io/s4u_io.tesh +++ b/examples/s4u/io/s4u_io.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ $SG_TEST_EXENV ./s4u_io_test +$ $SG_TEST_EXENV ${bindir:=.}/s4u_io_test > [denise:host:(0) 0.000000] [s4u_test/INFO] Storage info on denise: > [denise:host:(0) 0.000000] [s4u_test/INFO] Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000. > [denise:host:(0) 0.000000] [s4u_test/INFO] Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000. diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 0328cb69db..c834c9587b 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -284,8 +284,8 @@ IF(NOT enable_memcheck) # END TESH TESTS ### S4U ### - ADD_TESH_FACTORIES(s4u-basic "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/basic s4u_basic.tesh) - ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io.tesh) + ADD_TESH_FACTORIES(s4u-basic "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u/basic --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/basic s4u_basic.tesh) + ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u/io --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io.tesh) ### SIMDAG ### -- 2.20.1