[ROSAUTOTEST] Fix and improve some log handling (#1531)

* wmain(): Use endl instead of '\n', for 'System uptime'
* wmain(): Output "[ROSAUTOTEST] " in two cases: 'System uptime' and all CSimpleException.

diff --git a/modules/rostests/rosautotest/main.cpp b/modules/rostests/rosautotest/main.cpp
index 8d6d342..9c728d8 100644 (file)
--- a/modules/rostests/rosautotest/main.cpp
+++ b/modules/rostests/rosautotest/main.cpp
@@ -59,8 +59,10 @@ wmain(int argc, wchar_t* argv[])
         Configuration.GetSystemInformation();
         Configuration.GetConfigurationFromFile();
 
         Configuration.GetSystemInformation();
         Configuration.GetConfigurationFromFile();
 

-        ss << "\n\nSystem uptime " << setprecision(2) << fixed ;
-        ss << ((float)GetTickCount()/1000) << " seconds\n";
+        ss << endl
+           << endl
+           << "[ROSAUTOTEST] System uptime " << setprecision(2) << fixed;
+        ss << ((float)GetTickCount()/1000) << " seconds" << endl;

         StringOut(ss.str());
         
         /* Report tests startup */
         StringOut(ss.str());
         
         /* Report tests startup */


@@ -89,8 +91,11 @@ wmain(int argc, wchar_t* argv[])
     }
     catch(CSimpleException& e)
     {
     }
     catch(CSimpleException& e)
     {

+        stringstream ss;
+

         // e.GetMessage() must include ending '\n'.
         // e.GetMessage() must include ending '\n'.

-        StringOut(e.GetMessage());
+        ss << "[ROSAUTOTEST] " << e.GetMessage();
+        StringOut(ss.str());

     }
     catch(CFatalException& e)
     {
     }
     catch(CFatalException& e)
     {