From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 5 Mar 2014 10:41:46 +0000 (+0100)
Subject: Add test for missing dst gateway too.
X-Git-Tag: v3_11~242^2~27
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/75aa487e8e199bdaddb69ce71f4232048c95158e

Add test for missing dst gateway too.
---

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 1831abca4f..aa7a9b2e3a 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -114,7 +114,7 @@ if(NOT enable_memcheck)
   # exclude them from memcheck, as they normally die, leaving lots of unfree'd objects
   IF(enable_debug AND NOT enable_memcheck)
     ADD_TEST(tesh-parser-bogus-symmetric     ${TESH_COMMAND} ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms bogus_two_hosts_asymetric.tesh)
-    ADD_TEST(tesh-parser-bogus-missing-srcgw ${TESH_COMMAND} ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms bogus_missing_src_gateway.tesh)
+    ADD_TEST(tesh-parser-bogus-missing-gw ${TESH_COMMAND} ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms bogus_missing_gateway.tesh)
   ENDIF()
 
   ADD_TEST(tesh-simdag-bypass                   ${TESH_COMMAND} ${TESH_OPTION} --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)
diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index 7991322658..320a0c146a 100644
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -37,7 +37,7 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/get_full_link.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_src_gateway.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_gateway.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -79,6 +79,7 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_symmetric.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_src_gateway.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_dst_gateway.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric-2.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_fullduplex.xml
diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
new file mode 100644
index 0000000000..5ffbd2fa5c
--- /dev/null
+++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <AS id="World" routing="Full">
+     <AS id="us" routing="Full">
+                <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" power="9.27114e8" bw="938e6" lat="270us"/>
+    </AS>
+    <AS id="fr" routing="Full">
+                <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" power="9.27114e8" bw="938e6" lat="270us"/>
+    </AS>
+
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
+
+    <ASroute src="us" gw_src="node-cluster_router.cluster.us" dst="fr" gw_dst="neud-grappe_router.grappe.fr" symmetrical="YES">
+        <link_ctn id="backbone"/>
+    </ASroute>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.tesh b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh
similarity index 50%
rename from teshsuite/simdag/platforms/bogus_missing_src_gateway.tesh
rename to teshsuite/simdag/platforms/bogus_missing_gateway.tesh
index b95629c085..ade421e7ed 100644
--- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.tesh
+++ b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh
@@ -2,3 +2,6 @@ $ ${bindir:=.}/flatifier bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%
 > [  0.000000] [0:@] surf_workstation_model_init_ptask_L07
 > [  0.000000] [0:@] Parse error <some informative message>
 
+$ ${bindir:=.}/flatifier bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
+> [  0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [  0.000000] [0:@] Parse error <some informative message>