Output the string indicating the test which is going to be run in one call.

This should prevent a race condition, when another application also outputs something over the debug line.

svn path=/trunk/; revision=39027

diff --git a/rostests/rosautotest/winetests.c b/rostests/rosautotest/winetests.c
index 5ab622a..710939d 100644 (file)
--- a/rostests/rosautotest/winetests.c
+++ b/rostests/rosautotest/winetests.c
@@ -49,13 +49,14 @@ IntRunTest(PWSTR CommandLine, HANDLE hReadPipe, LPSTARTUPINFOW StartupInfo, PWIN
         LogLength = BUFFER_BLOCKSIZE;
     }
 
         LogLength = BUFFER_BLOCKSIZE;
     }
 

-    /* Execute the test */
-    StringOut("Running Wine Test, Module: ");
-    StringOut(GetSuiteIDData->Module);
-    StringOut(", Test: ");
-    StringOut(GetSuiteIDData->Test);
-    StringOut("\n");
+    /* Allocate a buffer with the exact size of the output string.
+       We have to output this string in one call to prevent a race condition, when another application also outputs a string over the debug line. */
+    Buffer = HeapAlloc(hProcessHeap, 0, 27 + strlen(GetSuiteIDData->Module) + 8 + strlen(GetSuiteIDData->Test) + 2);
+    sprintf(Buffer, "Running Wine Test, Module: %s, Test: %s\n", GetSuiteIDData->Module, GetSuiteIDData->Test);
+    StringOut(Buffer);
+    HeapFree(hProcessHeap, 0, Buffer);

 
 

+    /* Execute the test */

     if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo))
     {
         StringOut("CreateProcessW for running the test failed\n");
     if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo))
     {
         StringOut("CreateProcessW for running the test failed\n");