Skip to content

Commit 39b8c35

Browse files
author
Johnny Chen
committed
Simplify the progress bar display when neither "-v" nor "-t" is passed to the test driver.
llvm-svn: 155152
1 parent f1cfef1 commit 39b8c35

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

lldb/test/dotest.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,16 +1275,6 @@ def startTest(self, test):
12751275
self.stream.write(self.fmt % self.counter)
12761276
super(LLDBTestResult, self).startTest(test)
12771277

1278-
def stopTest(self, test):
1279-
"""Called when the given test has been run"""
1280-
if progress_bar:
1281-
sys.__stdout__.write('.')
1282-
sys.__stdout__.flush()
1283-
if self.counter == suite.countTestCases():
1284-
sys.__stdout__.write('\n')
1285-
1286-
super(LLDBTestResult, self).stopTest(test)
1287-
12881278
def addError(self, test, err):
12891279
global sdir_has_content
12901280
sdir_has_content = True
@@ -1328,7 +1318,7 @@ def addUnexpectedSuccess(self, test):
13281318
# Invoke the test runner.
13291319
if count == 1:
13301320
result = unittest2.TextTestRunner(stream=sys.stderr,
1331-
verbosity=verbose,
1321+
verbosity=(1 if progress_bar else verbose),
13321322
failfast=failfast,
13331323
resultclass=LLDBTestResult).run(suite)
13341324
else:
@@ -1338,7 +1328,7 @@ def addUnexpectedSuccess(self, test):
13381328
LLDBTestResult.__ignore_singleton__ = True
13391329
for i in range(count):
13401330
result = unittest2.TextTestRunner(stream=sys.stderr,
1341-
verbosity=verbose,
1331+
verbosity=(1 if progress_bar else verbose),
13421332
failfast=failfast,
13431333
resultclass=LLDBTestResult).run(suite)
13441334

0 commit comments

Comments
 (0)