Collect stderr separately from stdout and append it to the layout test outp...

webkit/tools/test_shell/test_shell_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <atlbase.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <shlwapi.h>
 #include <wininet.h>
@@ skipping 232 matching lines @@
     }
     
     if (params.dump_pixels && !should_dump_as_text) {
       // Image output: we write the image data to the file given on the
       // command line (for the dump pixels argument), and the MD5 sum to
       // stdout.
       dumped_anything = true;
       std::string md5sum = DumpImage(webFrame, params.pixel_file_name);
       printf("#MD5:%s\n", md5sum.c_str());
     }
-    if (dumped_anything)
+    if (dumped_anything) {
       printf("#EOF\n");
+      fprintf(stderr, "#EOF\n");
+    }
     fflush(stdout);
+    fflush(stderr);
   }
 
   return true;
 }
 
 std::string TestShell::RewriteLocalUrl(const std::string& url) {
   // Convert file:///tmp/LayoutTests urls to the actual location on disk.
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
@@ skipping 111 matching lines @@
   if (::IsDebuggerPresent())
     return 0;
 
   TestShell* shell = static_cast<TestShell*>(arg);
   DWORD timeout = static_cast<DWORD>(shell->GetFileTestTimeout() * 2.5);
   DWORD rv = WaitForSingleObject(shell->finished_event(), timeout);
   if (rv == WAIT_TIMEOUT) {
     // Print a warning to be caught by the layout-test script.
     // Note: the layout test driver may or may not recognize
     // this as a timeout.
-    puts("#TEST_TIMED_OUT\n");
-    puts("#EOF\n");
+    printf("#TEST_TIMED_OUT\n");
+    printf("#EOF\n");
+    fprintf(stderr, "#EOF\n");
     fflush(stdout);
+    fflush(stderr);
     TerminateProcess(GetCurrentProcess(), 0);
   }
   // Finished normally.
   return 0;
 }
 
 void TestShell::WaitTestFinished() {
   DCHECK(!test_is_pending_) << "cannot be used recursively";
 
   test_is_pending_ = true;
@@ skipping 307 matching lines @@
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
   return GetScreenInfoHelper(window);
 }
 
 }  // namespace webkit_glue