From a93d16c160eb9098efd08d5842ff668a0d95d75a Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Fri, 21 Jan 2022 09:55:03 +0100 Subject: [PATCH] fix java tesh files with new log category names --- MANIFEST.in | 3 +-- examples/c/comm-pingpong/comm-pingpong.tesh | 2 +- .../cpp/comm-pingpong/s4u-comm-pingpong.tesh | 2 +- examples/platforms/routing_none.xml | 17 ----------------- ...tant.xml => small_platform_routing_none.xml} | 1 + tools/cmake/DefinePackages.cmake | 3 +-- 6 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 examples/platforms/routing_none.xml rename examples/platforms/{small_platform_constant.xml => small_platform_routing_none.xml} (82%) diff --git a/MANIFEST.in b/MANIFEST.in index 1f89959290..3e6119611a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2003,14 +2003,13 @@ include examples/platforms/prop.xml include examples/platforms/ptask_L07.xml include examples/platforms/routing_cluster.cpp include examples/platforms/routing_cluster.xml -include examples/platforms/routing_none.xml include examples/platforms/simulacrum_7_hosts.xml include examples/platforms/small_platform.xml -include examples/platforms/small_platform_constant.xml include examples/platforms/small_platform_failures.xml include examples/platforms/small_platform_fatpipe.xml include examples/platforms/small_platform_one_link_routes.xml include examples/platforms/small_platform_profile.xml +include examples/platforms/small_platform_routing_none.xml include examples/platforms/small_platform_with_routers.xml include examples/platforms/storage/content/small_content.txt include examples/platforms/storage/content/storage_content.txt diff --git a/examples/c/comm-pingpong/comm-pingpong.tesh b/examples/c/comm-pingpong/comm-pingpong.tesh index cc129fdbca..b12b9edfed 100644 --- a/examples/c/comm-pingpong/comm-pingpong.tesh +++ b/examples/c/comm-pingpong/comm-pingpong.tesh @@ -41,7 +41,7 @@ $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xm p Testing the surf network constant model -$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_constant.xml comm-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_routing_none.xml comm-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' diff --git a/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh index 233348e263..f4ced5d2dd 100644 --- a/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh +++ b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh @@ -41,7 +41,7 @@ $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model: p Testing the surf network constant model -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_constant.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_routing_none.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' diff --git a/examples/platforms/routing_none.xml b/examples/platforms/routing_none.xml deleted file mode 100644 index 8bb7f4bb47..0000000000 --- a/examples/platforms/routing_none.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/platforms/small_platform_constant.xml b/examples/platforms/small_platform_routing_none.xml similarity index 82% rename from examples/platforms/small_platform_constant.xml rename to examples/platforms/small_platform_routing_none.xml index 9ce9bda5ba..3ae39e5739 100644 --- a/examples/platforms/small_platform_constant.xml +++ b/examples/platforms/small_platform_routing_none.xml @@ -1,5 +1,6 @@ + diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b48150fcc9..df871a4532 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1165,12 +1165,11 @@ set(PLATFORMS_EXAMPLES examples/platforms/prop.xml examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.cpp - examples/platforms/routing_none.xml examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt examples/platforms/small_platform.xml - examples/platforms/small_platform_constant.xml + examples/platforms/small_platform_routing_none.xml examples/platforms/small_platform_failures.xml examples/platforms/small_platform_fatpipe.xml examples/platforms/small_platform_one_link_routes.xml -- 2.20.1