From: Arnaud Giersch Date: Mon, 12 Mar 2018 11:09:44 +0000 (+0100) Subject: tuto-msg: fix parallel execution. X-Git-Tag: v3.19~60^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fccd092a0027eb1a36b3891347d3aecaa8a8410f?ds=inline tuto-msg: fix parallel execution. --- diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 0a731e758c..39e78d82e4 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -105,11 +105,15 @@ if((NOT enable_memcheck) AND (NOT enable_address_sanitizer) AND (NOT enable_unde 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") + ADD_TEST(tuto-msg-clean sh -xc "${tuto-make} clean") + ADD_TEST(tuto-msg-0 sh -xc "${tuto-make} masterworker && ${tuto-bin-path}/masterworker ${tuto-platform-file} ${tuto-src-path}/deployment0.xml") + ADD_TEST(tuto-msg-1 sh -xc "${tuto-make} masterworker-sol1 && ${tuto-bin-path}/masterworker-sol1 ${tuto-platform-file} ${tuto-src-path}/deployment1.xml") + ADD_TEST(tuto-msg-2 sh -xc "${tuto-make} masterworker-sol2 && ${tuto-bin-path}/masterworker-sol2 ${tuto-platform-file} ${tuto-src-path}/deployment2.xml") + ADD_TEST(tuto-msg-3 sh -xc "${tuto-make} masterworker-sol3 && ${tuto-bin-path}/masterworker-sol3 ${tuto-platform-file} ${tuto-src-path}/deployment3.xml") + ADD_TEST(tuto-msg-4 sh -xc "${tuto-make} masterworker-sol4 && ${tuto-bin-path}/masterworker-sol4 ${tuto-platform-file} ${tuto-src-path}/deployment3.xml") + + SET_TESTS_PROPERTIES(tuto-msg-clean PROPERTIES FIXTURES_SETUP tuto-msg-clean) + SET_TESTS_PROPERTIES(tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4 PROPERTIES FIXTURES_REQUIRED tuto-msg-clean) FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4) SET_TESTS_PROPERTIES(${TUTOTEST}