From: Pierre Veyre <pierre.veyre@cc.in2p3.fr>
Date: Tue, 27 May 2014 08:44:16 +0000 (+0200)
Subject: Improve code coverage
X-Git-Tag: v3_11~34^2~6
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/223e54b6dc5819f175fcc5477f204eb67b4a89a3

Improve code coverage
---

diff --git a/teshsuite/msg/storage/storage_basic.c b/teshsuite/msg/storage/storage_basic.c
index d352f27363..0ca80ad2c0 100644
--- a/teshsuite/msg/storage/storage_basic.c
+++ b/teshsuite/msg/storage/storage_basic.c
@@ -17,6 +17,7 @@ sg_size_t read_local_file(const char *src);
 void dump_storage_by_name(char *name);
 void display_storage_content(msg_storage_t storage);
 void get_set_storage_data(const char *storage_name);
+void dump_platform_storages(void);
 int client(int argc, char *argv[]);
 int server(int argc, char *argv[]);
 
@@ -139,6 +140,16 @@ void get_set_storage_data(const char *storage_name){
   xbt_free(data);
 }
 
+void dump_platform_storages(void){
+	unsigned int cursor;
+	xbt_dynar_t storages = MSG_storages_as_dynar();
+	msg_storage_t storage;
+	xbt_dynar_foreach(storages, cursor, storage){
+		XBT_INFO("Storage %s is attached to %s", MSG_storage_get_name(storage), MSG_storage_get_host(storage));
+		MSG_storage_set_property_value(storage, "usage", xbt_strdup("gpfs"), NULL);
+	}
+}
+
 int client(int argc, char *argv[])
 {
   hsm_put("server","/sd1/doc/simgrid/examples/cxx/autoDestination/FinalizeTask.cxx","/sd2/scratch/toto.cxx");
@@ -184,6 +195,7 @@ int server(int argc, char *argv[])
   }
 
   storage_info(MSG_host_self());
+  dump_platform_storages();
   return 1;
 }
 
diff --git a/teshsuite/msg/storage/storage_basic.tesh b/teshsuite/msg/storage/storage_basic.tesh
index 288ebc3d37..69f466adc5 100644
--- a/teshsuite/msg/storage/storage_basic.tesh
+++ b/teshsuite/msg/storage/storage_basic.tesh
@@ -57,4 +57,7 @@ $ storage_basic --cfg=path:${srcdir:=.} ${srcdir:=.}/platform.xml ${srcdir:=.}/d
 > [  3.208145] (1:server@server) 	/doc/simgrid/examples/cxx/basic/Main.cxx size: 10 bytes
 > [  3.208145] (1:server@server) 	/scratch/toto.cxx size: 500001 bytes
 > [  3.208145] (1:server@server) 	/doc/simgrid/examples/cxx/basic/Slave.cxx size: 10 bytes
+> [  3.208145] (1:server@server) Storage cdisk is attached to client
+> [  3.208145] (1:server@server) Storage sdisk1 is attached to server
+> [  3.208145] (1:server@server) Storage sdisk2 is attached to server
 > [  3.208145] (0:@) Simulated time: 3.20814