From d703a6f401b158a0151cb4edb419ab8e48e07da6 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 12 Mar 2018 10:04:33 +0100 Subject: [PATCH] tuto-msg: build examples in build dir. --- tools/cmake/Tests.cmake | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 0ad38d4d34..0a731e758c 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -100,13 +100,16 @@ endif() # Also test the tutorial, unless under Sanitizer or memcheck if((NOT enable_memcheck) AND (NOT enable_address_sanitizer) AND (NOT enable_undefined_sanitizer) AND (NOT enable_thread_sanitizer)) - set(tuto-path "${CMAKE_SOURCE_DIR}/doc/tuto-msg") - set(tuto-make "make -C ${tuto-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=\"-I${CMAKE_HOME_DIRECTORY}/include -I${CMAKE_BINARY_DIR}/include -L${CMAKE_BINARY_DIR}/lib\"") - ADD_TEST(tuto-msg-0 sh -xc "${tuto-make} clean masterworker && ${tuto-path}/masterworker ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment0.xml") - ADD_TEST(tuto-msg-1 sh -xc "${tuto-make} clean masterworker-sol1 && ${tuto-path}/masterworker-sol1 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment1.xml") - ADD_TEST(tuto-msg-2 sh -xc "${tuto-make} clean masterworker-sol2 && ${tuto-path}/masterworker-sol2 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment2.xml") - ADD_TEST(tuto-msg-3 sh -xc "${tuto-make} clean masterworker-sol3 && ${tuto-path}/masterworker-sol3 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment3.xml") - ADD_TEST(tuto-msg-4 sh -xc "${tuto-make} clean masterworker-sol4 && ${tuto-path}/masterworker-sol4 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment3.xml") + FILE(COPY doc/tuto-msg DESTINATION doc FILES_MATCHING PATTERN "Makefile" PATTERN "*.c") + set(tuto-src-path "${CMAKE_SOURCE_DIR}/doc/tuto-msg") + set(tuto-bin-path "${CMAKE_BINARY_DIR}/doc/tuto-msg") + set(tuto-platform-file "${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml") + set(tuto-make "make -C ${tuto-bin-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=\"-I${CMAKE_SOURCE_DIR}/include -I${CMAKE_BINARY_DIR}/include -L${CMAKE_BINARY_DIR}/lib\"") + ADD_TEST(tuto-msg-0 sh -xc "${tuto-make} clean masterworker && ${tuto-bin-path}/masterworker ${tuto-platform-file} ${tuto-src-path}/deployment0.xml") + ADD_TEST(tuto-msg-1 sh -xc "${tuto-make} clean masterworker-sol1 && ${tuto-bin-path}/masterworker-sol1 ${tuto-platform-file} ${tuto-src-path}/deployment1.xml") + ADD_TEST(tuto-msg-2 sh -xc "${tuto-make} clean masterworker-sol2 && ${tuto-bin-path}/masterworker-sol2 ${tuto-platform-file} ${tuto-src-path}/deployment2.xml") + ADD_TEST(tuto-msg-3 sh -xc "${tuto-make} clean masterworker-sol3 && ${tuto-bin-path}/masterworker-sol3 ${tuto-platform-file} ${tuto-src-path}/deployment3.xml") + ADD_TEST(tuto-msg-4 sh -xc "${tuto-make} clean masterworker-sol4 && ${tuto-bin-path}/masterworker-sol4 ${tuto-platform-file} ${tuto-src-path}/deployment3.xml") FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4) SET_TESTS_PROPERTIES(${TUTOTEST} -- 2.20.1