Add a test for function is_router.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8372 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index c7cbea8..9f33fc0 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -127,7 +127,7 @@ struct s_model_type {
 };
 
 struct s_network_element {
-  int id;
+  //int id;
   e_surf_network_element_type_t type;
 };
 

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index d8e8314..91d6140 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -3,13 +3,16 @@ cmake_minimum_required(VERSION 2.6)
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/")
 
 add_executable(basic_parsing_test basic_parsing_test.c)
+add_executable(is_router_test is_router_test.c)
 add_executable(flatifier flatifier.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
 target_link_libraries(basic_parsing_test simgrid m pthread )
+target_link_libraries(is_router_test simgrid m pthread )
 target_link_libraries(flatifier simgrid m pthread )
 else(NOT WIN32)
 target_link_libraries(basic_parsing_test simgrid)
+target_link_libraries(is_router_test simgrid)
 target_link_libraries(flatifier simgrid)
 endif(NOT WIN32)
\ No newline at end of file

diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml
new file mode 100644 (file)
index 0000000..9f007f6
--- /dev/null
+++ b/teshsuite/simdag/platforms/test_of_is_router.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="3">
+<AS  id="AS"  routing="Full">
+       
+       <AS  id="AS0"  routing="Full">
+          <host id="host01" power="1000000000"/>
+          <host id="host02" power="500000000"/>
+          <router id="router1"/>
+       </AS>
+       <AS  id="AS1"  routing="Floyd">
+          <host id="host03" power="1000000000"/>
+          <host id="host04" power="500000000"/>
+          <router id="router2"/>
+       </AS>
+       <AS  id="AS2"  routing="Dijkstra">
+          <host id="host05" power="1000000000"/>
+          <host id="host06" power="500000000"/>
+          <router id="router3"/>
+          </AS>
+       <AS  id="AS3"  routing="DijkstraCache">
+          <host id="host07" power="1000000000"/>
+          <host id="host08" power="500000000"/>
+          <router id="router4"/>
+       </AS>
+       <AS  id="AS4"  routing="none">
+          <host id="host09" power="1000000000"/>
+          <host id="host10" power="500000000"/>
+          <router id="router5"/>
+       </AS>
+       <AS  id="AS5"  routing="RuleBased">
+          <host id="host11" power="1000000000"/>
+          <host id="host12" power="500000000"/>
+          <router id="router6"/>          
+       </AS>
+       
+</AS>
+</platform>