X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff498d2432d650dc50282b04e3bd175a588eef8c..dfe0a18d70c56a5e1d5442ea6f59196a92915bfc:/teshsuite/simdag/CMakeLists.txt diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 53fb1687eb..767edc544a 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -1,6 +1,6 @@ -foreach(x availability basic0 basic1 basic3 basic4 basic5 basic6 basic-link-test basic-parsing-test - comm-mxn-all2all comm-mxn-independent comm-mxn-scatter comm-p2p-latency-1 - comm-p2p-latency-2 comm-p2p-latency-3 comm-p2p-latency-bound comp-only-par comp-only-seq incomplete) +foreach(x availability basic0 basic1 basic3 basic4 basic5 basic6 + comm-mxn-all2all comm-mxn-independent comm-mxn-scatter + comm-p2p-latency-bound incomplete) add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.c) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) @@ -10,16 +10,7 @@ foreach(x availability basic0 basic1 basic3 basic4 basic5 basic6 basic-link-test set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c) endforeach() -foreach(x evaluate-parse-time evaluate-get-route-time) - add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.c) - target_link_libraries(${x} simgrid) - set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) - add_dependencies(tests ${x}) - - set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c) -endforeach() - -foreach(x flatifier is-router) +foreach(x flatifier) add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) @@ -33,9 +24,6 @@ endforeach() set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_two_hosts_asymetric.tesh ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_missing_gateway.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_disk_attachment.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml @@ -62,8 +50,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_h ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1fl.xml ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1sl.xml ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1sl_hetero.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1switch.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_disk_attachment.xml PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1switch.xml PARENT_SCOPE) set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/platforms/carol.fail ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bob.trace ${CMAKE_CURRENT_SOURCE_DIR}/platforms/erin.avail @@ -71,35 +58,20 @@ set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/platforms/carol. ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.fail ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.lat PARENT_SCOPE) -foreach(x availability basic0 basic1 basic3 basic4 basic5 basic6 basic-link-test basic-parsing-test - comm-mxn-all2all comm-mxn-independent comm-mxn-scatter comm-p2p-latency-1 flatifier is-router - comm-p2p-latency-2 comm-p2p-latency-3 comm-p2p-latency-bound comp-only-par comp-only-seq incomplete) +foreach(x availability basic0 basic1 basic3 basic4 basic5 basic6 + comm-mxn-all2all comm-mxn-independent comm-mxn-scatter flatifier + comm-p2p-latency-bound incomplete) ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh) endforeach() -# test for code coverage -ADD_TEST(test-help-version ${TESH_WRAPPER_UNBOXED} ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test - --version --help --help-aliases --help-models --help-tracing) -ADD_TEST(test-help-logs ${TESH_WRAPPER_UNBOXED} ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test - --help-logs --help-log-categories) - -ADD_TESH(tesh-simdag-parser-bypass --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic-parsing-test --setenv srcdir=${CMAKE_HOME_DIRECTORY} basic-parsing-test-bypass.tesh) -ADD_TESH(tesh-simdag-parser-sym-full --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic-parsing-test basic-parsing-test-sym-full.tesh) - -ADD_TEST(tesh-simdag-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK) -ADD_TEST(tesh-simdag-full-links02 ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK) -ADD_TEST(tesh-simdag-one-link-g5k ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK) - -if(enable_debug AND NOT enable_memcheck) - # these tests need assertions. Exclude them from memcheck, as they normally die, leaving lots of unfree'd objects +if(enable_debug) + # these tests need assertions ADD_TESH(tesh-parser-bogus-symmetric --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh) ADD_TESH(tesh-parser-bogus-missing-gw --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh) - ADD_TESH(tesh-parser-bogus-disk-attachment --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh) #These tests fail on Windows as the signal returned is not the same as Unix would send. if(WIN32) set_property(TEST tesh-parser-bogus-symmetric PROPERTY WILL_FAIL TRUE) set_property(TEST tesh-parser-bogus-missing-gw PROPERTY WILL_FAIL TRUE) - set_property(TEST tesh-parser-bogus-disk-attachment PROPERTY WILL_FAIL TRUE) endif() endif()