Roll gtest-parallel.

BUG=
R=kwiberg@webrtc.org

Review URL: https://codereview.webrtc.org/1534773002

Cr-Commit-Position: refs/heads/master@{#11070}
This commit is contained in:
pbos
2015-12-17 07:15:32 -08:00
committed by Commit bot
parent 369f828bfe
commit a0b9549b88
2 changed files with 5 additions and 2 deletions

View File

@ -1,5 +1,5 @@
URL: https://github.com/google/gtest-parallel URL: https://github.com/google/gtest-parallel
Version: c65f666eebfedde586cba0bd3381666edc6c4afe Version: 8b2e48385942e947b14ac129f73c039802274390
License: Apache 2.0 License: Apache 2.0
License File: LICENSE License File: LICENSE

View File

@ -104,10 +104,12 @@ class Outputter(object):
else: else:
self.__out_file.write("\r" + msg[:self.__width].ljust(self.__width)) self.__out_file.write("\r" + msg[:self.__width].ljust(self.__width))
self.__previous_line_was_transient = True self.__previous_line_was_transient = True
def permanent_line(self, msg): def flush_transient_output(self):
if self.__previous_line_was_transient: if self.__previous_line_was_transient:
self.__out_file.write("\n") self.__out_file.write("\n")
self.__previous_line_was_transient = False self.__previous_line_was_transient = False
def permanent_line(self, msg):
self.flush_transient_output()
self.__out_file.write(msg + "\n") self.__out_file.write(msg + "\n")
stdout_lock = threading.Lock() stdout_lock = threading.Lock()
@ -169,6 +171,7 @@ class FilterFormat:
% (len(self.failures), self.total_tests)) % (len(self.failures), self.total_tests))
for (binary, test) in self.failures: for (binary, test) in self.failures:
self.out.permanent_line(" " + binary + ": " + test) self.out.permanent_line(" " + binary + ": " + test)
self.out.flush_transient_output()
class RawFormat: class RawFormat:
def log(self, line): def log(self, line):