fix java tesh files with new log category names

diff --git a/MANIFEST.in b/MANIFEST.in
index 1f89959..3e61196 100644 (file)
--- 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 cc129fd..b12b9ed 100644 (file)
--- 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 233348e..f4ced5d 100644 (file)
--- 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 (file)
index 8bb7f4b..0000000
--- a/examples/platforms/routing_none.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-<!--     This platform does not use any routing. It is what Constant network model expects. -->
-  <zone id="AS0" routing="None">
-    <host id="node-0.simgrid.org" speed="1Gf"/>
-    <host id="node-1.simgrid.org" speed="1Gf"/>
-    <host id="node-2.simgrid.org" speed="1Gf"/>
-    <host id="node-3.simgrid.org" speed="1Gf"/>
-    <host id="node-4.simgrid.org" speed="1Gf"/>
-    <host id="node-5.simgrid.org" speed="1Gf"/>
-    <host id="node-6.simgrid.org" speed="1Gf"/>
-    <host id="node-7.simgrid.org" speed="1Gf"/>
-    <host id="node-8.simgrid.org" speed="1Gf"/>
-    <host id="node-9.simgrid.org" speed="1Gf"/>
-  </zone>
-</platform>

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 9ce9bda..3ae39e5 100644 (file)
--- a/examples/platforms/small_platform_constant.xml
+++ b/examples/platforms/small_platform_routing_none.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
+<!--     This platform does not use any routing. It is what Constant network model expects. -->
 <platform version="4.1">
   <zone id="zone0" routing="None">
     <host id="Tremblay" speed="98.095Mf"/>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index b48150f..df871a4 100644 (file)
--- 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