[ROSAUTOTEST]

- Do not duplicate console output in StringOut if forcePrint = false
ROSTESTS-144

svn path=/trunk/; revision=64670

diff --git a/rostests/rosautotest/tools.cpp b/rostests/rosautotest/tools.cpp
index 413a2b8..38df4aa 100644 (file)
--- a/rostests/rosautotest/tools.cpp
+++ b/rostests/rosautotest/tools.cpp
@@ -143,14 +143,14 @@ StringOut(const string& String, bool forcePrint)
         }
     }
 
         }
     }
 

-    /* Output the string */
-    cout << NewString;
-

     size = curr_pos - start;
 
     /* Only print if forced to or if the rest is a whole line */
     if(forcePrint == true || NewString[curr_pos - 1] == '\n')
     {
     size = curr_pos - start;
 
     /* Only print if forced to or if the rest is a whole line */
     if(forcePrint == true || NewString[curr_pos - 1] == '\n')
     {

+        /* Output the whole string */
+        cout << NewString;
+

         memcpy(DbgString, NewString.c_str() + start, size);
         DbgString[size] = 0;
         DbgPrint(DbgString);
         memcpy(DbgString, NewString.c_str() + start, size);
         DbgString[size] = 0;
         DbgPrint(DbgString);


@@ -159,6 +159,9 @@ StringOut(const string& String, bool forcePrint)
         return NewString;
     }
 
         return NewString;
     }
 

+    /* Output full lines only */
+    cout << NewString.substr(0, start);
+

     /* Return the remaining chunk */
     return NewString.substr(start, size);
 }
     /* Return the remaining chunk */
     return NewString.substr(start, size);
 }