From: Frederic Suter Date: Thu, 17 Mar 2016 11:11:46 +0000 (+0100) Subject: mv is-router and flatifier to their own dir X-Git-Tag: v3_13~389 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/58af366e1783ea5d11e124a86ce13bdff812ce33 mv is-router and flatifier to their own dir --- diff --git a/.gitignore b/.gitignore index ee1cfbff7f..89a9d75f20 100644 --- a/.gitignore +++ b/.gitignore @@ -285,7 +285,7 @@ teshsuite/simdag/basic/basic3 teshsuite/simdag/basic/basic4 teshsuite/simdag/basic/basic5 teshsuite/simdag/basic/basic6 -teshsuite/simdag/incomplete/incomplete +teshsuite/simdag/basic-link-test/basic-link-test teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all teshsuite/simdag/comm-mxn-independent/comm-mxn-independent teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter @@ -293,17 +293,16 @@ teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1 teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2 teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3 teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound -teshsuite/simdag/network/test_reinit_costs teshsuite/simdag/comp-only-par/comp-only-par teshsuite/simdag/comp-only-seq/comp-only-seq -teshsuite/simdag/platforms/basic_link_test +teshsuite/simdag/incomplete/incomplete teshsuite/simdag/platforms/basic_parsing_test teshsuite/simdag/platforms/basic_tracing teshsuite/simdag/platforms/evaluate_get_route_time teshsuite/simdag/platforms/evaluate_parse_time -teshsuite/simdag/platforms/flatifier +teshsuite/simdag/flatifier/flatifier teshsuite/simdag/platforms/graphicator -teshsuite/simdag/platforms/is_router_test +teshsuite/simdag/is-router/is-router teshsuite/simix/check_defaults/check_defaults teshsuite/simix/stack_overflow/stack_overflow teshsuite/smpi/bug-17132/bug-17132 diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 704726c1d3..edffd4cd2f 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -10,6 +10,16 @@ foreach(x availability basic-link-test comm-mxn-all2all comm-mxn-independent com ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh) endforeach() +foreach(x flatifier is-router) + add_executable (${x} ${x}/${x}.cpp) + target_link_libraries(${x} simgrid) + set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) + + set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) + set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp) + + 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() + set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) set(tesh_files ${tesh_files} PARENT_SCOPE) - diff --git a/teshsuite/simdag/platforms/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp similarity index 100% rename from teshsuite/simdag/platforms/flatifier.cpp rename to teshsuite/simdag/flatifier/flatifier.cpp diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh similarity index 98% rename from teshsuite/simdag/platforms/flatifier.tesh rename to teshsuite/simdag/flatifier/flatifier.tesh index fcab6a72d1..656bd27e1b 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.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. > > @@ -135,7 +135,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P > > -$ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.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. > > @@ -269,7 +269,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6 > > -$ ${bindir:=.}/flatifier$EXEEXT host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.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. > > @@ -303,7 +303,7 @@ $ ${bindir:=.}/flatifier$EXEEXT host_attributes.xml "--log=root.fmt:[%10.6r]%e[% > > -$ ${bindir:=.}/flatifier$EXEEXT link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.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. > > @@ -321,7 +321,7 @@ $ ${bindir:=.}/flatifier$EXEEXT link_attributes.xml "--log=root.fmt:[%10.6r]%e[% > > -$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/three_hosts_non_symmetric_route.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. > > @@ -364,7 +364,7 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root. > > -$ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.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. > > @@ -499,7 +499,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > > -$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.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. > > @@ -526,7 +526,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r] > > -$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.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. > > diff --git a/teshsuite/simdag/platforms/is_router_test.cpp b/teshsuite/simdag/is-router/is-router.cpp similarity index 100% rename from teshsuite/simdag/platforms/is_router_test.cpp rename to teshsuite/simdag/is-router/is-router.cpp diff --git a/teshsuite/simdag/is-router/is-router.tesh b/teshsuite/simdag/is-router/is-router.tesh new file mode 100644 index 0000000000..4e1eaeac0b --- /dev/null +++ b/teshsuite/simdag/is-router/is-router.tesh @@ -0,0 +1,26 @@ +#! ./tesh + +$ ${bindir:=.}/is-router ../platforms/test_of_is_router.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. +> Host number: 10, link number: 1, elmts number: 21 +> - Seen: "host01". Type: host +> - Seen: "host02". Type: host +> - Seen: "host03". Type: host +> - Seen: "host04". Type: host +> - Seen: "host05". Type: host +> - Seen: "host06". Type: host +> - Seen: "host07". Type: host +> - Seen: "host08". Type: host +> - Seen: "host09". Type: host +> - Seen: "host10". Type: host +> - Seen: "router1". Type: router +> - Seen: "router2". Type: router +> - Seen: "router3". Type: router +> - Seen: "router4". Type: router +> - Seen: "router5". Type: router +> - Seen: "AS0". Type: AS +> - Seen: "AS1". Type: AS +> - Seen: "AS2". Type: AS +> - Seen: "AS3". Type: AS +> - Seen: "AS4". Type: AS +> - Seen: "AS". Type: AS diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 5aede5bd66..317a1f16c0 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -5,16 +5,10 @@ foreach(x basic_parsing_test evaluate_parse_time evaluate_get_route_time) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c) endforeach() -add_executable (is_router_test is_router_test.cpp) -target_link_libraries(is_router_test simgrid) -add_executable (flatifier flatifier.cpp) -target_link_libraries(flatifier simgrid) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_failing.tesh ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_sym_full.tesh ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test.tesh ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_bypass.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.tesh ${CMAKE_CURRENT_SOURCE_DIR}/get_full_link.tesh ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_gateway.tesh @@ -53,11 +47,10 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijks ${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(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/is_router_test.cpp 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/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index b41132bb2d..52a9949482 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -55,29 +55,3 @@ $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 6 $ rm -f ./bob0_availability_file.trace ./bob2_availability_file.trace ./bob0_state_file.trace ./bob2_state_file.trace - -$ ${bindir:=.}/is_router_test ./test_of_is_router.xml -> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. -> Host number: 10, link number: 1, elmts number: 21 -> - Seen: "host01". Type: host -> - Seen: "host02". Type: host -> - Seen: "host03". Type: host -> - Seen: "host04". Type: host -> - Seen: "host05". Type: host -> - Seen: "host06". Type: host -> - Seen: "host07". Type: host -> - Seen: "host08". Type: host -> - Seen: "host09". Type: host -> - Seen: "host10". Type: host -> - Seen: "router1". Type: router -> - Seen: "router2". Type: router -> - Seen: "router3". Type: router -> - Seen: "router4". Type: router -> - Seen: "router5". Type: router -> - Seen: "AS0". Type: AS -> - Seen: "AS1". Type: AS -> - Seen: "AS2". Type: AS -> - Seen: "AS3". Type: AS -> - Seen: "AS4". Type: AS -> - Seen: "AS". Type: AS - diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 00ef0d2db0..4e6c7c279c 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -101,7 +101,6 @@ IF(NOT enable_memcheck) ENDIF() ENDIF() ADD_TESH(tesh-simdag-bypass --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh) - ADD_TESH(tesh-simdag-flatifier --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) ADD_TESH(tesh-simdag-parser --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) ADD_TESH(tesh-simdag-parser-sym-full --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh) ADD_TESH(tesh-simdag-full-links --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)