From: Frederic Suter Date: Mon, 21 Mar 2016 08:48:52 +0000 (+0100) Subject: continue to emptty teshsuite/simdag/platforms/CMakeLists.txt X-Git-Tag: v3_13~351 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3e3c40ea76372f2d92c40043efcf1fd02ed0403b?ds=sidebyside continue to emptty teshsuite/simdag/platforms/CMakeLists.txt --- diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 27f8783158..8d426255c5 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -29,7 +29,65 @@ ADD_TEST(tesh-simdag-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic- 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 + ADD_TESH(tesh-parser-bogus-symmetric --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${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 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 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() + set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh +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_Dijkstra_ns3.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd_ns3.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_file.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_multicore.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_fullduplex.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_router_id.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_4p_1switch.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_include.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/properties.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/test_of_is_router.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/three_hosts_non_symmetric_route.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_clusters_one_name.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_clusters_router_id.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_clusters.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_src_gateway.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_dst_gateway.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_two_hosts_asymetric.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_fullduplex.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_symmetrical.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/clusterA.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/clusterB.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/Dijkstra.xml + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1bb.xml + ${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) +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 + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.bw + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.fail + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.lat PARENT_SCOPE) + \ No newline at end of file diff --git a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh new file mode 100644 index 0000000000..7a581f2d0b --- /dev/null +++ b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh @@ -0,0 +1,5 @@ +! expect signal SIGABRT +$ ${bindir:=.}/flatifier ../platforms/bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_disk_attachment.xml:21: Unable to attach storage cdisk: host plouf doesn't exist. +> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh new file mode 100644 index 0000000000..781b89f136 --- /dev/null +++ b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh @@ -0,0 +1,11 @@ +! expect signal SIGABRT +$ ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:16: ASroute gw_src='nod-cluster_router.cluster.us' does name a node. +> [ 0.000000] [0:maestro@] Exiting now + +! expect signal SIGABRT +$ ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:16: ASroute gw_dst='neud-grappe_router.grappe.fr' does name a node. +> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh new file mode 100644 index 0000000000..ee4e0a629c --- /dev/null +++ b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh @@ -0,0 +1,4 @@ +! expect signal SIGABRT +$ ${bindir:=.}/flatifier ../platforms/bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Error while loading ../platforms/bogus_two_hosts_asymetric.xml: The route between alice and bob already exists (Rq: routes are symmetrical by default). diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 35eaab60de..d18f0e90a2 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -5,47 +5,4 @@ foreach(x evaluate_parse_time evaluate_get_route_time) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c) endforeach() -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_gateway.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/bogus_disk_attachment.tesh PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijkstra_ns3.xml - ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_ns3.xml - ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml - ${CMAKE_CURRENT_SOURCE_DIR}/host_attributes.xml - ${CMAKE_CURRENT_SOURCE_DIR}/link_attributes.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_file.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_4p_1switch.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml - ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml - ${CMAKE_CURRENT_SOURCE_DIR}/three_hosts_non_symmetric_route.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_one_name.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_router_id.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters.xml - ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_src_gateway.xml - ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_dst_gateway.xml - ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_fullduplex.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_symmetrical.xml - ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link.xml - ${CMAKE_CURRENT_SOURCE_DIR}/clusterA.xml - ${CMAKE_CURRENT_SOURCE_DIR}/clusterB.xml - ${CMAKE_CURRENT_SOURCE_DIR}/Dijkstra.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl_hetero.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml - ${CMAKE_CURRENT_SOURCE_DIR}/bogus_disk_attachment.xml PARENT_SCOPE) -set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/carol.fail - ${CMAKE_CURRENT_SOURCE_DIR}/bob.trace - ${CMAKE_CURRENT_SOURCE_DIR}/erin.avail - ${CMAKE_CURRENT_SOURCE_DIR}/link.bw - ${CMAKE_CURRENT_SOURCE_DIR}/link.fail - ${CMAKE_CURRENT_SOURCE_DIR}/link.lat PARENT_SCOPE) set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) \ No newline at end of file diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh deleted file mode 100644 index 26bb0d9bd1..0000000000 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh +++ /dev/null @@ -1,5 +0,0 @@ -! expect signal SIGABRT -$ ${bindir:=.}/flatifier bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at bogus_disk_attachment.xml:21: Unable to attach storage cdisk: host plouf doesn't exist. -> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh deleted file mode 100644 index 46b83ba6b7..0000000000 --- a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh +++ /dev/null @@ -1,11 +0,0 @@ -! expect signal SIGABRT -$ ${bindir:=.}/flatifier bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at bogus_missing_src_gateway.xml:16: ASroute gw_src='nod-cluster_router.cluster.us' does name a node. -> [ 0.000000] [0:maestro@] Exiting now - -! expect signal SIGABRT -$ ${bindir:=.}/flatifier bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at bogus_missing_dst_gateway.xml:16: ASroute gw_dst='neud-grappe_router.grappe.fr' does name a node. -> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh deleted file mode 100644 index e3381ed4a1..0000000000 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh +++ /dev/null @@ -1,4 +0,0 @@ -! expect signal SIGABRT -$ ${bindir:=.}/flatifier bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Error while loading bogus_two_hosts_asymetric.xml: The route between alice and bob already exists (Rq: routes are symmetrical by default). diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 047bfdec28..0c393b5d75 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -67,25 +67,6 @@ IF(NOT enable_memcheck) ENDIF() ENDIF() - ## INTERFACES ## - ### SIMDAG ### - # BEGIN TESH TESTS - # these tests need the assertion mechanism - # exclude them from memcheck, as they normally die, leaving lots of unfree'd objects - IF(enable_debug AND NOT enable_memcheck) - ADD_TESH(tesh-parser-bogus-symmetric --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms 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/platforms 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/platforms 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() - # END TESH TESTS - ### SMPI ### IF(enable_smpi_MPICH3_testsuite) IF(HAVE_THREAD_CONTEXTS)