[Android] Clean up gtest stdout handling.

testing/android/native_test/native_test_launcher.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.
 
 // This class sets up the environment for running the native tests inside an
 // android application. It outputs (to a fifo) markers identifying the
 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
 // etc.
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
@@ skipping 54 matching lines @@
   va_end(args);
 }
 
 }  // namespace
 
 static void RunTests(JNIEnv* env,
                      const JavaParamRef<jobject>& obj,
                      const JavaParamRef<jstring>& jcommand_line_flags,
                      const JavaParamRef<jstring>& jcommand_line_file_path,
                      const JavaParamRef<jstring>& jstdout_file_path,
-                     jboolean jstdout_fifo,
                      const JavaParamRef<jobject>& app_context,
                      const JavaParamRef<jstring>& jtest_data_dir) {
   // Command line initialized basically, will be fully initialized later.
   static const char* const kInitialArgv[] = { "ChromeTestActivity" };
   base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   std::vector<std::string> args;
 
   const std::string command_line_file_path(
       base::android::ConvertJavaStringToUTF8(env, jcommand_line_file_path));
@@ skipping 13 matching lines @@
   base::CommandLine::ForCurrentProcess()->AppendArguments(
       base::CommandLine(argc, &argv[0]), false);
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   base::FilePath stdout_file_path(
       base::android::ConvertJavaStringToUTF8(env, jstdout_file_path));
 
   // A few options, such "--gtest_list_tests", will just use printf directly
   // Always redirect stdout to a known file.
-  unlink(stdout_file_path.value().c_str());
-  if (jstdout_fifo) {
-    if (!base::android::CreateFIFO(stdout_file_path, 0666)) {
-      AndroidLog(ANDROID_LOG_ERROR, "Failed to create fifo %s: %s\n",
-                 stdout_file_path.value().c_str(), strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-  }
-  if (!base::android::RedirectStream(stdout, stdout_file_path, "w+")) {
+  if (!base::android::RedirectStream(stdout, stdout_file_path, "a+")) {
     AndroidLog(ANDROID_LOG_ERROR, "Failed to redirect stream to file: %s: %s\n",
                stdout_file_path.value().c_str(), strerror(errno));
     exit(EXIT_FAILURE);
   }
   dup2(STDOUT_FILENO, STDERR_FILENO);
 
   if (command_line.HasSwitch(switches::kWaitForDebugger)) {
     AndroidLog(ANDROID_LOG_VERBOSE,
                "Native test waiting for GDB because flag %s was supplied",
                switches::kWaitForDebugger);
@@ skipping 24 matching lines @@
   sa.sa_sigaction = SignalHandler;
   sa.sa_flags = SA_SIGINFO;
 
   for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
     sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
   }
 }
 
 }  // namespace android
 }  // namespace testing