X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e3dc55ccce639ee98c99a71ea3f6755729b61d07..047ca9a2a6c647c2cc014d53460b8c359b3238c7:/buildtools/Cmake/AddTests.cmake diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index ae05705b17..1d1033ec8c 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -9,50 +9,7 @@ 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(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - message(STATUS"System processor: amd64") - set(HAVE_RAWCTX 1) -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") - message(STATUS"System processor: i386") - set(HAVE_RAWCTX 1) -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") - message(STATUS"System processor: alpha") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - # Subdir is "arm" for both big-endian (arm) and little-endian (armel). - message(STATUS"System processor: arm") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") - # mips* machines are bi-endian mostly so processor does not tell - # endianess of the underlying system. - message(STATUS"System processor: ${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - message(STATUS"System processor: ppc64") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - message(STATUS"System processor: ppc") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") - # Both flavours can run on the same processor - message(STATUS"System processor: ${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)") - message(STATUS"System processor: parisc" "parisc64") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390") - # s390 binaries can run on s390x machines - message(STATUS"System processor: ${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x") - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh") - message(STATUS"System processor: sh") - -ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND - message("PROCESSOR NOT FIND: ${CMAKE_SYSTEM_PROCESSOR}") - -ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + ### For code coverage ### Set some variables @@ -406,6 +363,12 @@ 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) @@ -416,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") @@ -491,35 +456,6 @@ endif(${ARCH_32_BITS}) # Those tests are broken : set to "fail" for release v3.6 if(release) -if(${ARCH_32_BITS}) - set_tests_properties(gras-rpc-sg-32-thread PROPERTIES WILL_FAIL true) - set_tests_properties(gras-all2all-sg-32-thread PROPERTIES WILL_FAIL true) - set_tests_properties(gras-synchro-sg-32-thread PROPERTIES WILL_FAIL true) - if(HAVE_UCONTEXT_H) - set_tests_properties(gras-rpc-sg-32-ucontext PROPERTIES WILL_FAIL true) - set_tests_properties(gras-all2all-sg-32-ucontext PROPERTIES WILL_FAIL true) - set_tests_properties(gras-synchro-sg-32-ucontext PROPERTIES WILL_FAIL true) - endif(HAVE_UCONTEXT_H) - if(HAVE_RAWCTX) - set_tests_properties(gras-rpc-sg-32-raw PROPERTIES WILL_FAIL true) - set_tests_properties(gras-all2all-sg-32-raw PROPERTIES WILL_FAIL true) - set_tests_properties(gras-synchro-sg-32-raw PROPERTIES WILL_FAIL true) - endif(HAVE_RAWCTX) -else(${ARCH_32_BITS}) - set_tests_properties(gras-rpc-sg-64-thread PROPERTIES WILL_FAIL true) - set_tests_properties(gras-all2all-sg-64-thread PROPERTIES WILL_FAIL true) - set_tests_properties(gras-synchro-sg-64-thread PROPERTIES WILL_FAIL true) - if(HAVE_UCONTEXT_H) - set_tests_properties(gras-rpc-sg-64-ucontext PROPERTIES WILL_FAIL true) - set_tests_properties(gras-all2all-sg-64-ucontext PROPERTIES WILL_FAIL true) - set_tests_properties(gras-synchro-sg-64-ucontext PROPERTIES WILL_FAIL true) - endif(HAVE_UCONTEXT_H) - if(HAVE_RAWCTX) - set_tests_properties(gras-rpc-sg-64-raw PROPERTIES WILL_FAIL true) - set_tests_properties(gras-all2all-sg-64-raw PROPERTIES WILL_FAIL true) - set_tests_properties(gras-synchro-sg-64-raw PROPERTIES WILL_FAIL true) - endif(HAVE_RAWCTX) -endif(${ARCH_32_BITS}) if(HAVE_MC) set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true) set_tests_properties(mc-bugged2-thread PROPERTIES WILL_FAIL true)