X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc030fa0846f0336bca44af8688909b6355b0f32..047ca9a2a6c647c2cc014d53460b8c359b3238c7:/buildtools/Cmake/AddTests.cmake diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index d510f5d258..1d1033ec8c 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -9,16 +9,8 @@ if(enable_smpi AND NOT WIN32) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI") exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI") endif(enable_smpi AND NOT WIN32) - - -if(${PROCESSOR_x86_64}) - set(HAVE_RAWCTX 1) -endif(${PROCESSOR_x86_64}) -if(${PROCESSOR_i686}) - set(HAVE_RAWCTX 1) -endif(${PROCESSOR_i686}) - + ### For code coverage ### Set some variables SET(UPDATE_TYPE "svn") @@ -371,10 +363,15 @@ endif(HAVE_RAWCTX) endif(HAVE_TRACING) endif(HAVE_GTNETS) +if(HAVE_NS3) +ADD_TEST(msg-ns3-thread ${CMAKE_BINARY_DIR}/bin/tesh --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh) +ADD_TEST(msg-ns3-ucontext ${CMAKE_BINARY_DIR}/bin/tesh --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh) +ADD_TEST(msg-ns3-raw ${CMAKE_BINARY_DIR}/bin/tesh --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh) +endif(HAVE_NS3) + IF(HAVE_TRACING) ADD_TEST(tracing-ms ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh) ADD_TEST(tracing-categories ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh) - ADD_TEST(tracing-volume ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/volume.tesh) ADD_TEST(tracing-tasks ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh) ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh) ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh) @@ -382,10 +379,12 @@ ENDIF(HAVE_TRACING) # Lua examples if(HAVE_LUA) +ADD_TEST(lua-duplicated-globals ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/state_cloner duplicated_globals.tesh) ADD_TEST(lua-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/masterslave master_slave.tesh) ADD_TEST(lua-mult-matrix ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/multi_matrix mult_matrix.tesh) ADD_TEST(lua-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console master_slave_bypass.tesh) ADD_TEST(lua-msg-masterslave-console ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh) +set_tests_properties(lua-duplicated-globals PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-masterslave PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-mult-matrix PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-masterslave-bypass PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") @@ -436,19 +435,40 @@ endif(HAVE_MC) # Amok is broken in RL since before v3.3 (should fix it one day) set_tests_properties(amok-bandwidth-rl amok-saturate-rl PROPERTIES WILL_FAIL true) if(${ARCH_32_BITS}) - set_tests_properties(amok-bandwidth-sg-32-thread amok-bandwidth-sg-32-ucontext PROPERTIES WILL_FAIL true) - set_tests_properties(amok-saturate-sg-32-thread amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true) + set_tests_properties(amok-bandwidth-sg-32-thread PROPERTIES WILL_FAIL true) + set_tests_properties(amok-saturate-sg-32-thread PROPERTIES WILL_FAIL true) + if(HAVE_UCONTEXT_H) + set_tests_properties(amok-bandwidth-sg-32-ucontext amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true) + endif(HAVE_UCONTEXT_H) if(HAVE_RAWCTX) set_tests_properties(amok-bandwidth-sg-32-raw amok-saturate-sg-32-raw PROPERTIES WILL_FAIL true) endif(HAVE_RAWCTX) else(${ARCH_32_BITS}) - set_tests_properties(amok-bandwidth-sg-64-thread amok-bandwidth-sg-64-ucontext PROPERTIES WILL_FAIL true) - set_tests_properties(amok-saturate-sg-64-thread amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true) + set_tests_properties(amok-bandwidth-sg-64-thread PROPERTIES WILL_FAIL true) + set_tests_properties(amok-saturate-sg-64-thread PROPERTIES WILL_FAIL true) + if(HAVE_UCONTEXT_H) + set_tests_properties(amok-bandwidth-sg-64-ucontext amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true) + endif(HAVE_UCONTEXT_H) if(HAVE_RAWCTX) set_tests_properties(amok-bandwidth-sg-64-raw amok-saturate-sg-64-raw PROPERTIES WILL_FAIL true) endif(HAVE_RAWCTX) endif(${ARCH_32_BITS}) +# Those tests are broken : set to "fail" for release v3.6 +if(release) +if(HAVE_MC) + set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true) + set_tests_properties(mc-bugged2-thread PROPERTIES WILL_FAIL true) + set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true) + if(HAVE_UCONTEXT_H) + set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true) + endif(HAVE_UCONTEXT_H) + if(HAVE_RAWCTX) + set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true) + endif(HAVE_RAWCTX) +endif(HAVE_MC) +endif(release) + endif(NOT enable_memcheck) ADD_TEST(tesh-simdag-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)