X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15a08d1cdb8b6f402e311c1457086640b150dbbd..ab4337b69bd5b574b3152ca7ada7251ca21a4e59:/buildtools/Cmake/AddTests.cmake diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index db7cacc202..058e632242 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -6,7 +6,6 @@ if(enable_smpi) endif(enable_smpi) if(enable_memcheck) - include(FindPerl) exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION") if(VALGRIND_VERSION AND PERL_EXECUTABLE) string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}") @@ -88,7 +87,8 @@ ENDIF(${ARCH_32_BITS}) ADD_TEST(tesh-msg-get_sender ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh) ADD_TEST(tesh-simdag-reinit_costs ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh) -ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/basic_parsing_test.tesh) +ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) +ADD_TEST(tesh-simdag-parser-sym-full ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh) ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) ADD_TEST(tesh-simdag-basic0 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh) ADD_TEST(tesh-simdag-basic1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh) @@ -129,7 +129,6 @@ ADD_TEST(msg-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/ ADD_TEST(msg-masterslave-forwarder ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_forwarder.tesh) ADD_TEST(msg-masterslave-failure ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_failure.tesh) ADD_TEST(msg-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh) -ADD_TEST(msg-masterslave-console ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh) ADD_TEST(msg-masterslave-mailbox ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh) ADD_TEST(msg-masterslave-vivaldi ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_vivaldi.tesh) ADD_TEST(msg-migration ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg migration/migration.tesh) @@ -139,9 +138,6 @@ ADD_TEST(msg-properties ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/ ADD_TEST(msg-trace ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg trace/trace.tesh) ADD_TEST(msg-masterslave_cpu_ti ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh) ADD_TEST(msg_icomms ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/icomms peer.tesh) -ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 - ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml - ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml) IF(HAVE_TRACING) ADD_TEST(tracing-ms ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg tracing/ms.tesh) @@ -195,15 +191,6 @@ ADD_TEST(simdag-test_prop ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY} ADD_TEST(simdag-metaxml_test ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh) ADD_TEST(simdag-minmin_test ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh) -if(enable_smpi) -# smpi examples -ADD_TEST(smpi-bcast ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/bcast.tesh) -ADD_TEST(smpi-reduce ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/reduce.tesh) -if(HAVE_TRACING) - ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh) -endif(HAVE_TRACING) -endif(enable_smpi) - if(HAVE_GTNETS) ADD_TEST(msg-gtnets-waxman ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh) ADD_TEST(msg-gtnets-dogbone ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh) @@ -224,6 +211,7 @@ if(HAVE_LUA) ADD_TEST(lua-masterslave ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh) ADD_TEST(lua-mult_matrix ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh) ADD_TEST(lua-masterslave_bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh) +ADD_TEST(msg-masterslave-console ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh) endif(HAVE_LUA) # Ruby examples @@ -235,6 +223,16 @@ endif(HAVE_RUBY) # END TESH TESTS +if(enable_smpi) +# smpi examples +ADD_TEST(smpi-bcast ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/bcast.tesh) +ADD_TEST(smpi-reduce ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/reduce.tesh) +if(HAVE_TRACING) + ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh) +endif(HAVE_TRACING) +endif(enable_smpi) + +# examples/msg/mc if(HAVE_MC) ADD_TEST(mc-bugged1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/mc bugged1.tesh) ADD_TEST(mc-bugged2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/mc bugged2.tesh) @@ -263,27 +261,62 @@ set_tests_properties(tesh-gras-dd-r_big32_2 PROPERTIES WILL_FAIL true) # Expected to fail until the parser gets better (v3.3.5?) set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true) +# set_tests_properties( msg-masterslave-console PROPERTIES WILL_FAIL true) if(HAVE_RUBY) set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true) endif(HAVE_RUBY) + +# Expected to fail for gras +set(GRAS_IS_BROKEN 0) +if(GRAS_IS_BROKEN) + set_tests_properties( gras-ping-rl PROPERTIES WILL_FAIL true) + set_tests_properties( gras-rpc-rl PROPERTIES WILL_FAIL true) + if(enable_model-checking) + set_tests_properties( gras-mmrpc-rl PROPERTIES WILL_FAIL true) + endif(enable_model-checking) + set_tests_properties( gras-all2all-rl PROPERTIES WILL_FAIL true) + if(${ARCH_32_BITS}) + set_tests_properties( gras-ping-sg-32 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-rpc-sg-32 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-spawn-sg-32 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-all2all-sg-32 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-pmm-sg-32 PROPERTIES WILL_FAIL true) + set_tests_properties( amok-bandwidth-sg-32 PROPERTIES WILL_FAIL true) + set_tests_properties( amok-saturate-sg-32 PROPERTIES WILL_FAIL true) + else(${ARCH_32_BITS}) + set_tests_properties( gras-ping-sg-64 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-rpc-sg-64 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-spawn-sg-64 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-all2all-sg-64 PROPERTIES WILL_FAIL true) + set_tests_properties( gras-pmm-sg-64 PROPERTIES WILL_FAIL true) + set_tests_properties( amok-bandwidth-sg-64 PROPERTIES WILL_FAIL true) + set_tests_properties( amok-saturate-sg-64 PROPERTIES WILL_FAIL true) + endif(${ARCH_32_BITS}) +endif(GRAS_IS_BROKEN) + endif(NOT enable_memcheck) +ADD_TEST(tesh-simdag-full-links01 ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK) +ADD_TEST(tesh-simdag-full-links02 ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK) +ADD_TEST(tesh-simdag-one-link-g5k ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK) +ADD_TEST(msg_icomms_waitany ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml) + # testsuite directory -add_test(test-xbt-log ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage) -add_test(test-xbt-graphxml ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml) -add_test(test-xbt-heap ${PROJECT_DIRECTORY}/testsuite/xbt/heap_bench) +add_test(test-xbt-log ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/log_usage) +add_test(test-xbt-graphxml ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml) +add_test(test-xbt-heap ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/heap_bench) -add_test(test-surf-lmm ${PROJECT_DIRECTORY}/testsuite/surf/lmm_usage) -add_test(test-surf-maxmin ${PROJECT_DIRECTORY}/testsuite/surf/maxmin_bench) -add_test(test-surf-usage ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml) -add_test(test-surf_usage2 ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage2 --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml) -add_test(test-surf-trace ${PROJECT_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/) +add_test(test-surf-lmm ${CMAKE_HOME_DIRECTORY}/testsuite/surf/lmm_usage) +add_test(test-surf-maxmin ${CMAKE_HOME_DIRECTORY}/testsuite/surf/maxmin_bench) +add_test(test-surf-usage ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml) +add_test(test-surf_usage2 ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2 --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml) +add_test(test-surf-trace ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/) -add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml) -add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml) -add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml) +add_test(test-simdag-1 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml) +add_test(test-simdag-2 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml) +add_test(test-simdag-3 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml) -add_test(testall ${PROJECT_DIRECTORY}/src/testall) +add_test(testall ${CMAKE_HOME_DIRECTORY}/src/testall) -include(${PROJECT_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake) +include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)