[Lldb-commits] [lldb] r226477 - Print out the full output of gtest

[Vince Harron]

Author: vharron
Date: Mon Jan 19 12:18:24 2015
New Revision: 226477

URL: http://llvm.org/viewvc/llvm-project?rev=226477&view=rev
Log:
Print out the full output of gtest

This patch fixes a bug that prevented all gtest output from being
displayed.

Submitted for Tamas Berghammer


Modified:
    lldb/trunk/gtest/do-gtest.py

Modified: lldb/trunk/gtest/do-gtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/gtest/do-gtest.py?rev=226477&r1=226476&r2=226477&view=diff
==============================================================================
--- lldb/trunk/gtest/do-gtest.py (original)
+++ lldb/trunk/gtest/do-gtest.py Mon Jan 19 12:18:24 2015
@@ -63,8 +63,7 @@ def line_combine_printer(file, previous_
             return (new_line, remaining_count)
         else:
             # Time to write it out.
-            if len(new_line) > 0:
-                print(new_line, file=file)
+            print(new_line, file=file)
             return ("", 0)
 
 def call_make(makefile_dir, extra_args=None, stdout=sys.stdout, stderr=sys.stderr):
@@ -98,17 +97,17 @@ def call_make(makefile_dir, extra_args=N
 
             # Drain stdout.
             while True:
-                line = proc.stdout.readline().rstrip()
+                line = proc.stdout.readline()
                 if line and len(line) > 0:
-                    stdout_data = line_combine_printer(stdout, stdout_data, filter_run_line(sub_expr, line))
+                    stdout_data = line_combine_printer(stdout, stdout_data, filter_run_line(sub_expr, line.rstrip()))
                 else:
                     break
 
             # Drain stderr.
             while True:
-                line = proc.stderr.readline().rstrip()
+                line = proc.stderr.readline()
                 if line and len(line) > 0:
-                    stderr_data = line_combine_printer(stderr, stderr_data, filter_run_line(sub_expr, line))
+                    stderr_data = line_combine_printer(stderr, stderr_data, filter_run_line(sub_expr, line.rstrip()))
                 else:
                     break