[Lldb-commits] [lldb] r155152 - /lldb/trunk/test/dotest.py

[Johnny Chen]

Author: johnny
Date: Thu Apr 19 15:09:44 2012
New Revision: 155152

URL: http://llvm.org/viewvc/llvm-project?rev=155152&view=rev
Log:
Simplify the progress bar display when neither "-v" nor "-t" is passed to the test driver.

Modified:
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=155152&r1=155151&r2=155152&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Thu Apr 19 15:09:44 2012
@@ -1275,16 +1275,6 @@
                     self.stream.write(self.fmt % self.counter)
                 super(LLDBTestResult, self).startTest(test)
 
-            def stopTest(self, test):
-                """Called when the given test has been run"""
-                if progress_bar:
-                    sys.__stdout__.write('.')
-                    sys.__stdout__.flush()
-                    if self.counter == suite.countTestCases():
-                        sys.__stdout__.write('\n')
-
-                super(LLDBTestResult, self).stopTest(test)
-
             def addError(self, test, err):
                 global sdir_has_content
                 sdir_has_content = True
@@ -1328,7 +1318,7 @@
         # Invoke the test runner.
         if count == 1:
             result = unittest2.TextTestRunner(stream=sys.stderr,
-                                              verbosity=verbose,
+                                              verbosity=(1 if progress_bar else verbose),
                                               failfast=failfast,
                                               resultclass=LLDBTestResult).run(suite)
         else:
@@ -1338,7 +1328,7 @@
             LLDBTestResult.__ignore_singleton__ = True
             for i in range(count):
                 result = unittest2.TextTestRunner(stream=sys.stderr,
-                                                  verbosity=verbose,
+                                                  verbosity=(1 if progress_bar else verbose),
                                                   failfast=failfast,
                                                   resultclass=LLDBTestResult).run(suite)