From: Navarrop <Pierre.Navarro@imag.fr>
Date: Mon, 17 Oct 2011 15:35:37 +0000 (+0200)
Subject: Update tag include
X-Git-Tag: exp_20120216~554
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/120ec9c610bf252b623d64100db2e95b2ea8e5c8

Update tag include
---

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 9244f2da95..240b07ab61 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -127,6 +127,7 @@ void STag_surfxml_include(void)
   surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r");
   xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n",
               A_surfxml_include_file);
+  xbt_dynar_push_as(surf_input_buffer_stack,YY_BUFFER_STATE,surf_input_buffer);
   surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
   surf_parse_push_buffer_state(surf_input_buffer);
   fflush(NULL);
@@ -138,6 +139,7 @@ void ETag_surfxml_include(void)
   fclose(surf_file_to_parse);
   xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
   surf_parse_pop_buffer_state();
+  surf_input_buffer = xbt_dynar_pop_as(surf_input_buffer_stack,YY_BUFFER_STATE);
   XBT_INFO("ETag_surfxml_include '%s'",A_surfxml_include_file);
 }
 
diff --git a/teshsuite/simdag/platforms/platform_include.xml b/teshsuite/simdag/platforms/platform_include.xml
index 0fc194d99f..8cd04da06e 100644
--- a/teshsuite/simdag/platforms/platform_include.xml
+++ b/teshsuite/simdag/platforms/platform_include.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 	<AS id="main" routing="Full">
-		<include file="/home/navarrop/Developments/simgrid-git/teshsuite/simdag/platforms/clusterA.xml"/>
-		<include file="/home/navarrop/Developments/simgrid-git/teshsuite/simdag/platforms/clusterB.xml"/>
+		<include file="clusterA.xml"/>
+		<include file="clusterB.xml"/>
 	</AS>
 </platform>