From: Martin Quinson Date: Fri, 9 Mar 2018 16:03:06 +0000 (+0100) Subject: tuto tests: fix out of tree, don't try to do when the compiler is not gcc X-Git-Tag: v3.19~115 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/22f6838423728e184fd2e2cc5418aa0695a9630e tuto tests: fix out of tree, don't try to do when the compiler is not gcc --- diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 18f6a56598..5ebe49804b 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -98,15 +98,16 @@ else() set(EXTRA_DIST ${EXTRA_DIST} src/surf/trace_mgr_test.cpp) endif() - # Also test the tutorial -ADD_TEST(tuto-msg-0 sh -c "make -C doc/tuto-msg masterworker && doc/tuto-msg/masterworker examples/platforms/small_platform.xml doc/tuto-msg/deployment0.xml") -ADD_TEST(tuto-msg-1 sh -c "make -C doc/tuto-msg masterworker-sol1 && doc/tuto-msg/masterworker-sol1 examples/platforms/small_platform.xml doc/tuto-msg/deployment1.xml") -ADD_TEST(tuto-msg-2 sh -c "make -C doc/tuto-msg masterworker-sol2 && doc/tuto-msg/masterworker-sol2 examples/platforms/small_platform.xml doc/tuto-msg/deployment2.xml") -ADD_TEST(tuto-msg-3 sh -c "make -C doc/tuto-msg masterworker-sol3 && doc/tuto-msg/masterworker-sol3 examples/platforms/small_platform.xml doc/tuto-msg/deployment3.xml") -ADD_TEST(tuto-msg-4 sh -c "make -C doc/tuto-msg masterworker-sol4 && doc/tuto-msg/masterworker-sol4 examples/platforms/small_platform.xml doc/tuto-msg/deployment3.xml") +if(CMAKE_COMPILER_IS_GNUCC) + ADD_TEST(tuto-msg-0 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment0.xml") + ADD_TEST(tuto-msg-1 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol1 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol1 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment1.xml") + ADD_TEST(tuto-msg-2 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol2 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol2 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment2.xml") + ADD_TEST(tuto-msg-3 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol3 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol3 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment3.xml") + ADD_TEST(tuto-msg-4 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol4 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol4 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment3.xml") -FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4) + FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4) SET_TESTS_PROPERTIES(${TUTOTEST} - PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=lib") -ENDFOREACH() + PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") + ENDFOREACH() +endif()