From d85949accc8820a54c468fbdf930063be5873296 Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 30 Nov 2010 17:32:41 +0000
Subject: [PATCH] Remove test of metaxml which is not compatible with the new
 parser. Now platform v3

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8769 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/AddTests.cmake       |  4 --
 examples/platforms/metaxml-random.xml | 37 -----------------
 examples/platforms/metaxml.xml        | 57 ---------------------------
 3 files changed, 98 deletions(-)
 delete mode 100644 examples/platforms/metaxml-random.xml
 delete mode 100644 examples/platforms/metaxml.xml

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 8e8cd1f289..21427d3e1b 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -189,7 +189,6 @@ ADD_TEST(simdag-test_simdag	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTOR
 ADD_TEST(simdag-test_simdag2	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag test_simdag2.tesh)
 ADD_TEST(simdag-test_simdag_seq_access	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag test_simdag_seq_access.tesh)
 ADD_TEST(simdag-test_prop	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag properties/test_prop.tesh)
-ADD_TEST(simdag-metaxml_test	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)
 ADD_TEST(simdag-minmin_test	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
 
 if(HAVE_GTNETS)
@@ -266,9 +265,6 @@ else(${ARCH_32_BITS})
 	set_tests_properties( amok-saturate-sg-64 PROPERTIES WILL_FAIL true)  
 endif(${ARCH_32_BITS})
 
-# Expected to fail until the parser gets better (v3.3.5?)
-set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true)
-
 if(HAVE_RUBY)
 set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true)
 endif(HAVE_RUBY)
diff --git a/examples/platforms/metaxml-random.xml b/examples/platforms/metaxml-random.xml
deleted file mode 100644
index 9af1fcd082..0000000000
--- a/examples/platforms/metaxml-random.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- This file shows how to define 2 sets of hosts, their corresponding links and how you can bind them using the route:multi tag 
-      Also it shows how to use the random generator for generating random cpu power
- -->
- <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "simgrid.dtd">
- <platform version="3">
- <AS  id="AS0"  routing="Full">
- 
-   <random id="rand_lyon" min="237333000" max="437333000" mean="337333000" std_deviation="100000000"/>
-   <random id="rand_lille" min="137333000" max="250000000" mean="237333000" std_deviation="400000000"/>
- 
-   <set id="Lille" prefix="lille_" suffix="_host" radical="0-5"/> 
-   <set id="Lyon" prefix="lyon_" suffix="_host" radical="0-3"/> 
-   <foreach set_id="Lyon">
-     <host id="$1" power="$rand(rand_lyon)"/>
-     <link id="$1" bandwidth="3297750" latency="0.000007234"/>
-   </foreach>
-   <foreach set_id="Lille">
-     <host id="$1" power="$rand(rand_lille)"/>
-     <link id="$1" bandwidth="3297750" latency="0.000007234"/>
-   </foreach>
- 
-   <route:multi src="Lille" dst="Lille" symmetric="NO">
-     <link_ctn id="$src"/>
-   </route:multi>
- 
-   <route:multi src="Lyon" dst="Lyon" symmetric="NO">
-     <link_ctn id="$src"/>
-   </route:multi>
- 
-   <route:multi src="Lille" dst="Lyon">
-     <link_ctn id="$src"/>
-     <link_ctn id="$dst"/>
-   </route:multi>
- 
- </AS>
- </platform>
diff --git a/examples/platforms/metaxml.xml b/examples/platforms/metaxml.xml
deleted file mode 100644
index 9c2760ccd7..0000000000
--- a/examples/platforms/metaxml.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- This platform shows the use of traces, clusters and sets of hosts defined with the new XML format. It also explains how to define
-      routes between sets of hosts using the route:multi tag
- -->
- <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "simgrid.dtd">
- <platform version="3">
- <AS  id="AS0"  routing="Full">
- 
-   <!-- define a trace inside the XML file -->
-   <trace id="mytrace" periodicity="12">
- 	5 100    <!-- new value at time 5  is 100 -->
- 	12 200   <!-- new value at time 12 is 200 -->
- 	15 140   <!-- new value at time 15 is 140 -->
- 	<!-- value will stay at 140 for 12 more seconds (the periodicity parameter), and go back on top of the trace afterward) -->
-   </trace>
- 
-   <!-- define a cluster for Nancy. Hosts, links, backbone, routes for inter linkage and external linkage are generated by the parser automatically --> 
-   <cluster id="Nancy" prefix="nancy_" radical="0-2" suffix="_host" power="1234566789" bw="125000000" lat="0.00005" bb_bw="50000000" bb_lat="0.001"/>
- 
-   <!-- Now we will define in 5 steps the same thing for cluster Lille but using the tags foreach and route:multi -->
- 
-   <!-- 1. Define Lille set -->
-   <set id="Lille" prefix="lille_" suffix="_host" radical="0-2"/>
- 
-   <!-- 2. Define the Lille group (host+link) -->
-   <foreach set_id="Lille">
-     <host id="$1" power="1234566789"/>
-     <link id="$1" bandwidth="125000000" latency="0.00005"/>
-   </foreach>
- 
-   <!-- 3. Backbones for Lille hosts -->
-   <link id="Lille_bb" bandwidth="50000000" latency="0.00005"/>
- 
-   <!-- Define backbone for communication between Nancy and Lille-->
-   <link id="INTER-bb" bandwidth="125000000" latency="0.000100"/>
- 
-   <!-- 4. Define startpoint for Lille -> $* (All other hosts including Nancy hosts) routes. It is the starting point so it overrides all previosly routes!!! -->
-   <route:multi src="Lille" dst="$*" action="OVERRIDE" symmetric="NO">
-     <link_ctn id="$src"/>
-   </route:multi>
- 
-   <!-- 5. Define Lille intra-cluster communication. Default behaviour POSTPEND links to already existing routes, and NOT symmetric because all routes are created in the first pass.  If you choose symmetric you will duplicate links due to POSTPEND !!!-->
-   <route:multi src="Lille" dst="Lille" symmetric="NO">
-     <link_ctn id="Lille_bb"/>
-   </route:multi>
- 
-   <!-- Add other links to routes. Default behaviour POSTPEND links to already existing routes -->
-   <route:multi src="Nancy" dst="Lille">
-     <link_ctn id="INTER-bb"/>
-     <link_ctn id="$dst"/>
-   </route:multi>
-   
-   <!-- Connect the trace with the host nancy_0_host -->
-   <trace_connect trace="mytrace" kind="POWER" element="nancy_0_host"/>
- 
- </AS>
- </platform>
-- 
2.20.1