From 102eee116018d7c6e9f4b9301421b137272d84fb Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 17 Mar 2016 09:54:51 +0100 Subject: [PATCH] mv a test out of platforms dir --- teshsuite/simdag/CMakeLists.txt | 4 ++-- .../basic-link-test.c} | 0 .../basic-link-test.tesh} | 11 ++++++++++- teshsuite/simdag/platforms/CMakeLists.txt | 3 +-- tools/cmake/Tests.cmake | 1 - 5 files changed, 13 insertions(+), 6 deletions(-) rename teshsuite/simdag/{platforms/basic_link_test.c => basic-link-test/basic-link-test.c} (100%) rename teshsuite/simdag/{platforms/basic_link_test.tesh => basic-link-test/basic-link-test.tesh} (63%) diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 5c9dce472c..704726c1d3 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -1,5 +1,5 @@ -foreach(x availability 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 basic-link-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) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) diff --git a/teshsuite/simdag/platforms/basic_link_test.c b/teshsuite/simdag/basic-link-test/basic-link-test.c similarity index 100% rename from teshsuite/simdag/platforms/basic_link_test.c rename to teshsuite/simdag/basic-link-test/basic-link-test.c diff --git a/teshsuite/simdag/platforms/basic_link_test.tesh b/teshsuite/simdag/basic-link-test/basic-link-test.tesh similarity index 63% rename from teshsuite/simdag/platforms/basic_link_test.tesh rename to teshsuite/simdag/basic-link-test/basic-link-test.tesh index 304258b4e5..a68f72c662 100644 --- a/teshsuite/simdag/platforms/basic_link_test.tesh +++ b/teshsuite/simdag/basic-link-test/basic-link-test.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ${bindir:=.}/basic_link_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-link-test ../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. > [ 0.000000] (0:maestro@) Link count: 12 > [ 0.000000] (0:maestro@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 @@ -15,3 +15,12 @@ $ ${bindir:=.}/basic_link_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@ > [ 0.000000] (0:maestro@) bob_cluster_link_4_UP: latency = 0.00005, bandwidth = 125000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_link_6_DOWN: latency = 0.00005, bandwidth = 125000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_link_6_UP: latency = 0.00005, bandwidth = 125000000.000000 + +$ ${bindir:=.}/basic-link-test ../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. +> [ 0.000000] (0:maestro@) Link count: 5 +> [ 0.000000] (0:maestro@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 +> [ 0.000000] (0:maestro@) link1: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) link2: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) link3: latency = 0.00010, bandwidth = 80000000.000000 +> [ 0.000000] (0:maestro@) link4: latency = 0.00010, bandwidth = 80000000.000000 diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 54f5b75c63..5aede5bd66 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -1,4 +1,4 @@ -foreach(x basic_parsing_test basic_link_test evaluate_parse_time evaluate_get_route_time) +foreach(x basic_parsing_test evaluate_parse_time evaluate_get_route_time) add_executable (${x} ${x}.c) target_link_libraries(${x} simgrid) @@ -14,7 +14,6 @@ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_te ${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}/basic_link_test.tesh ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.tesh ${CMAKE_CURRENT_SOURCE_DIR}/get_full_link.tesh ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 4f776c8f24..00ef0d2db0 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -102,7 +102,6 @@ IF(NOT enable_memcheck) 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-link --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_link_test.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) -- 2.20.1