Reland: Take 2: Force python test server output to be unbuffered, so it doesn't mix with gtest outpu

content/test/layout_test_http_server.cc

 // Copyright (c) 2012 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 "content/test/layout_test_http_server.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 10 matching lines @@
 bool PrepareCommandLine(CommandLine* cmd_line) {
   FilePath src_path;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_path))
     return false;
 
   FilePath python_runtime;
   if (!GetPythonRunTime(&python_runtime))
     return false;
   cmd_line->SetProgram(python_runtime);
 
+  // Use unbuffered output, so that testserver output doesn't mix with gtest
+  // output in test log files. See http://crbug.com/147368.
+  cmd_line->AppendArg("-u");
+
   FilePath script_path(src_path);
   script_path = script_path.AppendASCII("third_party");
   script_path = script_path.AppendASCII("WebKit");
   script_path = script_path.AppendASCII("Tools");
   script_path = script_path.AppendASCII("Scripts");
   script_path = script_path.AppendASCII("new-run-webkit-httpd");
 
   cmd_line->AppendArgPath(script_path);
   return true;
 }
@@ skipping 84 matching lines @@
   running_ = !stopped;
 
 #if defined(OS_WIN)
   // Close the job object handle now. This should clean up
   // any orphaned processes.
   job_handle_.Close();
 #endif
 
   return stopped;
 }