rework that test too (no windows stuff and no tabs)

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
index 8beb1e2..78fe0ef 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -15,13 +15,13 @@ static void display_storage_properties(simgrid::s4u::Storage* storage)
 {
   const std::unordered_map<std::string, std::string>* props = storage->get_properties();
   if (not props->empty()) {
 {
   const std::unordered_map<std::string, std::string>* props = storage->get_properties();
   if (not props->empty()) {

-    XBT_INFO("\tProperties of mounted storage: %s", storage->get_cname());
+    XBT_INFO("  Properties of mounted storage: %s", storage->get_cname());

 
     for (auto const& elm : *props) {
       XBT_INFO("    %s->%s", elm.first.c_str(), elm.second.c_str());
     }
   } else {
 
     for (auto const& elm : *props) {
       XBT_INFO("    %s->%s", elm.first.c_str(), elm.second.c_str());
     }
   } else {

-    XBT_INFO("\tNo property attached.");
+    XBT_INFO("  No property attached.");

   }
 }
 
   }
 }
 


@@ -63,9 +63,9 @@ static void display_storage_content(simgrid::s4u::Storage* storage)
   std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->get_content();
   if (not content->empty()) {
     for (auto const& entry : *content)
   std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->get_content();
   if (not content->empty()) {
     for (auto const& entry : *content)

-      XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), entry.second);
+      XBT_INFO("  %s size: %llu bytes", entry.first.c_str(), entry.second);

   } else {
   } else {

-    XBT_INFO("\tNo content.");
+    XBT_INFO("  No content.");

   }
 }
 
   }
 }
 


@@ -85,7 +85,7 @@ static void get_set_storage_data(const std::string& storage_name)
   XBT_INFO("Get data: '%s'", data ? data->c_str() : "No User Data");
   storage->set_data(new std::string("Some data"));
   data = static_cast<std::string*>(storage->get_data());
   XBT_INFO("Get data: '%s'", data ? data->c_str() : "No User Data");
   storage->set_data(new std::string("Some data"));
   data = static_cast<std::string*>(storage->get_data());

-  XBT_INFO("\tSet and get data: '%s'", data->c_str());
+  XBT_INFO("  Set and get data: '%s'", data->c_str());

   delete data;
 }
 
   delete data;
 }
 


@@ -106,10 +106,10 @@ static void storage_info(simgrid::s4u::Host* host)
   for (auto const& elm : host->get_mounted_storages()) {
     const std::string& mount_name  = elm.first;
     simgrid::s4u::Storage* storage = elm.second;
   for (auto const& elm : host->get_mounted_storages()) {
     const std::string& mount_name  = elm.first;
     simgrid::s4u::Storage* storage = elm.second;

-    XBT_INFO("\tStorage name: %s, mount name: %s", storage->get_cname(), mount_name.c_str());
+    XBT_INFO("  Storage name: %s, mount name: %s", storage->get_cname(), mount_name.c_str());

 
 

-    XBT_INFO("\t\tFree size: %llu bytes", sg_storage_get_size_free(storage));
-    XBT_INFO("\t\tUsed size: %llu bytes", sg_storage_get_size_used(storage));
+    XBT_INFO("    Free size: %llu bytes", sg_storage_get_size_free(storage));
+    XBT_INFO("    Used size: %llu bytes", sg_storage_get_size_used(storage));

 
     display_storage_properties(storage);
     dump_storage_by_name(storage->get_cname());
 
     display_storage_properties(storage);
     dump_storage_by_name(storage->get_cname());


@@ -118,9 +118,9 @@ static void storage_info(simgrid::s4u::Host* host)
 
 static void client()
 {
 
 static void client()
 {

-  hsm_put("alice", "/home/doc/simgrid/examples/msg/icomms/small_platform.xml", "c:\\Windows\\toto.cxx");
-  hsm_put("alice", "/home/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml", "c:\\Windows\\titi.xml");
-  hsm_put("alice", "/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "c:\\Windows\\tata.c");
+  hsm_put("alice", "/home/doc/simgrid/examples/msg/icomms/small_platform.xml", "/tmp/toto.xml");
+  hsm_put("alice", "/home/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml", "/tmp/titi.xml");
+  hsm_put("alice", "/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "/tmp/tata.c");

 
   simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name("alice");
   mailbox->put(new std::string("finalize"), 0);
 
   simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name("alice");
   mailbox->put(new std::string("finalize"), 0);

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.tesh b/teshsuite/s4u/storage_client_server/storage_client_server.tesh
index 6d097a8..c3ab82d 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.tesh
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.tesh
@@ -1,47 +1,41 @@
 $ ./storage_client_server ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (server@alice) *** Storage info on alice ***
 $ ./storage_client_server ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (server@alice) *** Storage info on alice ***

-> [  0.000000] (server@alice)  Storage name: Disk2, mount name: c:
-> [  0.000000] (server@alice)          Free size: 534479374867 bytes
-> [  0.000000] (server@alice)          Used size: 2391537133 bytes
-> [  0.000000] (server@alice)  No property attached.
+> [  0.000000] (server@alice)   Storage name: Disk2, mount name: /tmp
+> [  0.000000] (server@alice)     Free size: 536857690006 bytes
+> [  0.000000] (server@alice)     Used size: 13221994 bytes
+> [  0.000000] (server@alice)   No property attached.

 > [  0.000000] (server@alice) *** Dump a storage element ***
 > [  0.000000] (server@alice) Print the content of the storage element: Disk2
 > [  0.000000] (server@alice) *** Dump a storage element ***
 > [  0.000000] (server@alice) Print the content of the storage element: Disk2

-> [  0.000000] (server@alice)  \Windows\CoreSingleLanguage.xml size: 31497 bytes
-> [  0.000000] (server@alice)  \Windows\DPINST.LOG size: 18944 bytes
-> [  0.000000] (server@alice)  \Windows\DirectX.log size: 10486 bytes
-> [  0.000000] (server@alice)  \Windows\DtcInstall.log size: 1955 bytes
-> [  0.000000] (server@alice)  \Windows\HelpPane.exe size: 883712 bytes
-> [  0.000000] (server@alice)  \Windows\MEMORY.DMP size: 2384027342 bytes
-> [  0.000000] (server@alice)  \Windows\PFRO.log size: 6770 bytes
-> [  0.000000] (server@alice)  \Windows\Professional.xml size: 31881 bytes
-> [  0.000000] (server@alice)  \Windows\Starter.xml size: 31537 bytes
-> [  0.000000] (server@alice)  \Windows\WLXPGSS.SCR size: 322048 bytes
-> [  0.000000] (server@alice)  \Windows\WMSysPr9.prx size: 316640 bytes
-> [  0.000000] (server@alice)  \Windows\WindowsUpdate.log size: 1518934 bytes
-> [  0.000000] (server@alice)  \Windows\_isusr32.dll size: 180320 bytes
-> [  0.000000] (server@alice)  \Windows\avastSS.scr size: 41664 bytes
-> [  0.000000] (server@alice)  \Windows\bfsvc.exe size: 75264 bytes
-> [  0.000000] (server@alice)  \Windows\bootstat.dat size: 67584 bytes
-> [  0.000000] (server@alice)  \Windows\csup.txt size: 12 bytes
-> [  0.000000] (server@alice)  \Windows\dchcfg64.exe size: 335464 bytes
-> [  0.000000] (server@alice)  \Windows\dcmdev64.exe size: 93288 bytes
-> [  0.000000] (server@alice)  \Windows\explorer.exe size: 2380944 bytes
-> [  0.000000] (server@alice)  \Windows\font1.sii size: 4907 bytes
-> [  0.000000] (server@alice)  \Windows\font2.sii size: 8698 bytes
-> [  0.000000] (server@alice)  \Windows\hapint.exe size: 382056 bytes
-> [  0.000000] (server@alice)  \Windows\hh.exe size: 17408 bytes
-> [  0.000000] (server@alice)  \Windows\mib.bin size: 43131 bytes
-> [  0.000000] (server@alice)  \Windows\notepad.exe size: 243712 bytes
-> [  0.000000] (server@alice)  \Windows\regedit.exe size: 159232 bytes
-> [  0.000000] (server@alice)  \Windows\setupact.log size: 101663 bytes
-> [  0.000000] (server@alice)  \Windows\setuperr.log size: 0 bytes
-> [  0.000000] (server@alice)  \Windows\splwow64.exe size: 126464 bytes
-> [  0.000000] (server@alice)  \Windows\system.ini size: 219 bytes
-> [  0.000000] (server@alice)  \Windows\twain_32.dll size: 50176 bytes
-> [  0.000000] (server@alice)  \Windows\vmgcoinstall.log size: 1585 bytes
-> [  0.000000] (server@alice)  \Windows\win.ini size: 92 bytes
-> [  0.000000] (server@alice)  \Windows\winhlp32.exe size: 10752 bytes
-> [  0.000000] (server@alice)  \Windows\write.exe size: 10752 bytes
+> [  0.000000] (server@alice)   /bin/smpicc size: 918 bytes
+> [  0.000000] (server@alice)   /bin/tesh size: 356434 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/msg/README size: 4805 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c size: 6217 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/msg/icomms/small_platform.xml size: 972 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml size: 654 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/msg/trace/test9.xml size: 598 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/platforms/g5k.xml size: 17028 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/DT/README size: 999 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/EP/README size: 347 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/EP/randlc.c size: 3300 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/FT/README size: 276 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/MG/README size: 5465 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/MPI_dummy/README size: 2406 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/README size: 1857 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/SP/README size: 926 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/common/randdp.c size: 1441 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/NAS/sys/README size: 1461 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/smpi/mc_bugged2.c size: 1387 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/examples/xbt/sem_basic.c size: 1970 bytes
+> [  0.000000] (server@alice)   /doc/simgrid/html/group__XBT__str.html size: 36192 bytes
+> [  0.000000] (server@alice)   /include/instr/instr.h size: 5750 bytes
+> [  0.000000] (server@alice)   /include/mc/modelchecker.h size: 96 bytes
+> [  0.000000] (server@alice)   /include/msg/datatypes.h size: 4635 bytes
+> [  0.000000] (server@alice)   /include/simdag/simdag.h size: 10325 bytes
+> [  0.000000] (server@alice)   /include/simix/simix.h size: 13003 bytes
+> [  0.000000] (server@alice)   /include/smpi/mpif.h size: 4826 bytes
+> [  0.000000] (server@alice)   /include/surf/simgrid_dtd.h size: 23583 bytes
+> [  0.000000] (server@alice)   /include/xbt/fifo.h size: 3626 bytes
+> [  0.000000] (server@alice)   /lib/libsimgrid.so.3.6.2 size: 12710497 bytes

 > [  0.000000] (server@alice) Server waiting for transfers ...
 > [  0.000010] (client@bob) client has read 972 on /home/doc/simgrid/examples/msg/icomms/small_platform.xml
 > [  0.000010] (client@bob) client sends 972 to alice
 > [  0.000000] (server@alice) Server waiting for transfers ...
 > [  0.000010] (client@bob) client has read 972 on /home/doc/simgrid/examples/msg/icomms/small_platform.xml
 > [  0.000010] (client@bob) client sends 972 to alice


@@ -53,55 +47,49 @@ $ ./storage_client_server ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6
 > [  0.803996] (client@bob) client sends 6217 to alice
 > [  0.806104] (server@alice) 6217 bytes on 6217 bytes have been written by server on /sd1
 > [  1.207952] (server@alice) *** Storage info on alice ***
 > [  0.803996] (client@bob) client sends 6217 to alice
 > [  0.806104] (server@alice) 6217 bytes on 6217 bytes have been written by server on /sd1
 > [  1.207952] (server@alice) *** Storage info on alice ***

-> [  1.207952] (server@alice)  Storage name: Disk2, mount name: c:
-> [  1.207952] (server@alice)          Free size: 534479367024 bytes
-> [  1.207952] (server@alice)          Used size: 2391544976 bytes
-> [  1.207952] (server@alice)  No property attached.
+> [  1.207952] (server@alice)   Storage name: Disk2, mount name: /tmp
+> [  1.207952] (server@alice)     Free size: 536857682163 bytes
+> [  1.207952] (server@alice)     Used size: 13229837 bytes
+> [  1.207952] (server@alice)   No property attached.

 > [  1.207952] (server@alice) *** Dump a storage element ***
 > [  1.207952] (server@alice) Print the content of the storage element: Disk2
 > [  1.207952] (server@alice) *** Dump a storage element ***
 > [  1.207952] (server@alice) Print the content of the storage element: Disk2

-> [  1.207952] (server@alice)  \Windows\CoreSingleLanguage.xml size: 31497 bytes
-> [  1.207952] (server@alice)  \Windows\DPINST.LOG size: 18944 bytes
-> [  1.207952] (server@alice)  \Windows\DirectX.log size: 10486 bytes
-> [  1.207952] (server@alice)  \Windows\DtcInstall.log size: 1955 bytes
-> [  1.207952] (server@alice)  \Windows\HelpPane.exe size: 883712 bytes
-> [  1.207952] (server@alice)  \Windows\MEMORY.DMP size: 2384027342 bytes
-> [  1.207952] (server@alice)  \Windows\PFRO.log size: 6770 bytes
-> [  1.207952] (server@alice)  \Windows\Professional.xml size: 31881 bytes
-> [  1.207952] (server@alice)  \Windows\Starter.xml size: 31537 bytes
-> [  1.207952] (server@alice)  \Windows\WLXPGSS.SCR size: 322048 bytes
-> [  1.207952] (server@alice)  \Windows\WMSysPr9.prx size: 316640 bytes
-> [  1.207952] (server@alice)  \Windows\WindowsUpdate.log size: 1518934 bytes
-> [  1.207952] (server@alice)  \Windows\_isusr32.dll size: 180320 bytes
-> [  1.207952] (server@alice)  \Windows\avastSS.scr size: 41664 bytes
-> [  1.207952] (server@alice)  \Windows\bfsvc.exe size: 75264 bytes
-> [  1.207952] (server@alice)  \Windows\bootstat.dat size: 67584 bytes
-> [  1.207952] (server@alice)  \Windows\csup.txt size: 12 bytes
-> [  1.207952] (server@alice)  \Windows\dchcfg64.exe size: 335464 bytes
-> [  1.207952] (server@alice)  \Windows\dcmdev64.exe size: 93288 bytes
-> [  1.207952] (server@alice)  \Windows\explorer.exe size: 2380944 bytes
-> [  1.207952] (server@alice)  \Windows\font1.sii size: 4907 bytes
-> [  1.207952] (server@alice)  \Windows\font2.sii size: 8698 bytes
-> [  1.207952] (server@alice)  \Windows\hapint.exe size: 382056 bytes
-> [  1.207952] (server@alice)  \Windows\hh.exe size: 17408 bytes
-> [  1.207952] (server@alice)  \Windows\mib.bin size: 43131 bytes
-> [  1.207952] (server@alice)  \Windows\notepad.exe size: 243712 bytes
-> [  1.207952] (server@alice)  \Windows\regedit.exe size: 159232 bytes
-> [  1.207952] (server@alice)  \Windows\setupact.log size: 101663 bytes
-> [  1.207952] (server@alice)  \Windows\setuperr.log size: 0 bytes
-> [  1.207952] (server@alice)  \Windows\splwow64.exe size: 126464 bytes
-> [  1.207952] (server@alice)  \Windows\system.ini size: 219 bytes
-> [  1.207952] (server@alice)  \Windows\tata.c size: 6217 bytes
-> [  1.207952] (server@alice)  \Windows\titi.xml size: 654 bytes
-> [  1.207952] (server@alice)  \Windows\toto.cxx size: 972 bytes
-> [  1.207952] (server@alice)  \Windows\twain_32.dll size: 50176 bytes
-> [  1.207952] (server@alice)  \Windows\vmgcoinstall.log size: 1585 bytes
-> [  1.207952] (server@alice)  \Windows\win.ini size: 92 bytes
-> [  1.207952] (server@alice)  \Windows\winhlp32.exe size: 10752 bytes
-> [  1.207952] (server@alice)  \Windows\write.exe size: 10752 bytes
+> [  1.207952] (server@alice)   /bin/smpicc size: 918 bytes
+> [  1.207952] (server@alice)   /bin/tesh size: 356434 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/msg/README size: 4805 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c size: 6217 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/msg/icomms/small_platform.xml size: 972 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml size: 654 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/msg/trace/test9.xml size: 598 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/platforms/g5k.xml size: 17028 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/DT/README size: 999 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/EP/README size: 347 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/EP/randlc.c size: 3300 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/FT/README size: 276 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/MG/README size: 5465 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/MPI_dummy/README size: 2406 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/README size: 1857 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/SP/README size: 926 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/common/randdp.c size: 1441 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/NAS/sys/README size: 1461 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/smpi/mc_bugged2.c size: 1387 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/examples/xbt/sem_basic.c size: 1970 bytes
+> [  1.207952] (server@alice)   /doc/simgrid/html/group__XBT__str.html size: 36192 bytes
+> [  1.207952] (server@alice)   /include/instr/instr.h size: 5750 bytes
+> [  1.207952] (server@alice)   /include/mc/modelchecker.h size: 96 bytes
+> [  1.207952] (server@alice)   /include/msg/datatypes.h size: 4635 bytes
+> [  1.207952] (server@alice)   /include/simdag/simdag.h size: 10325 bytes
+> [  1.207952] (server@alice)   /include/simix/simix.h size: 13003 bytes
+> [  1.207952] (server@alice)   /include/smpi/mpif.h size: 4826 bytes
+> [  1.207952] (server@alice)   /include/surf/simgrid_dtd.h size: 23583 bytes
+> [  1.207952] (server@alice)   /include/xbt/fifo.h size: 3626 bytes
+> [  1.207952] (server@alice)   /lib/libsimgrid.so.3.6.2 size: 12710497 bytes
+> [  1.207952] (server@alice)   /tata.c size: 6217 bytes
+> [  1.207952] (server@alice)   /titi.xml size: 654 bytes
+> [  1.207952] (server@alice)   /toto.xml size: 972 bytes

 > [  1.207952] (server@alice) Storage Disk1 is attached to bob
 > [  1.207952] (client@bob) *** GET/SET DATA for storage element: Disk1 ***
 > [  1.207952] (client@bob) Get data: 'No User Data'
 > [  1.207952] (server@alice) Storage Disk1 is attached to bob
 > [  1.207952] (client@bob) *** GET/SET DATA for storage element: Disk1 ***
 > [  1.207952] (client@bob) Get data: 'No User Data'

-> [  1.207952] (client@bob)    Set and get data: 'Some data'
+> [  1.207952] (client@bob)   Set and get data: 'Some data'

 > [  1.207952] (server@alice) Storage Disk2 is attached to alice
 > [  1.207952] (server@alice) Storage Disk3 is attached to carl
 > [  1.207952] (server@alice) Storage Disk4 is attached to denise
 > [  1.207952] (server@alice) Storage Disk2 is attached to alice
 > [  1.207952] (server@alice) Storage Disk3 is attached to carl
 > [  1.207952] (server@alice) Storage Disk4 is attached to denise