zturner updated this revision to Diff 31491.
zturner added a comment.
Merge the test name into the progress line. If we want to get overwritable
lines we will need to use a stateful line printer that can clear the contents
of the current line after issuing a carriage return.
http://reviews.llvm.org/D11816
Files:
test/dosep.py
Index: test/dosep.py
===================================================================
--- test/dosep.py
+++ test/dosep.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
"""
Run the test suite using a separate process for each test file.
@@ -67,6 +67,7 @@
test_counter = None
total_tests = None
dotest_options = None
+output_on_success = False
def setup_global_variables(lock, counter, total, options):
global output_lock, test_counter, total_tests, dotest_options
@@ -75,19 +76,34 @@
total_tests = total
dotest_options = options
-def update_status(name = None, command = None, output = None):
+def report_test_failure(name, command, output):
+ global output_lock
+ with output_lock:
+ print >> sys.stderr, "\n"
+ print >> sys.stderr, output
+ print >> sys.stderr, "Command invoked: %s" % ' '.join(command)
+ update_progress("FAILED", name)
+
+def report_test_pass(name, output):
+ global output_lock, output_on_success
+ with output_lock:
+ if output_on_success:
+ print >> sys.stderr, "\n"
+ print >> sys.stderr, output
+ update_progress("PASSED", name)
+
+def update_progress(test_name, result):
global output_lock, test_counter, total_tests
with output_lock:
- if output is not None:
- print >> sys.stderr
- print >> sys.stderr, "Failed test suite: %s" % name
- print >> sys.stderr, "Command invoked: %s" % ' '.join(command)
- print >> sys.stderr, "stdout:\n%s" % output[0]
- print >> sys.stderr, "stderr:\n%s" % output[1]
- sys.stderr.write("\r%*d out of %d test suites processed" %
- (len(str(total_tests)), test_counter.value, total_tests))
+ if test_name != None:
+ sys.stderr.write("\n[%s %s] - %d out of %d test suites processed" %
+ (result, test_name, test_counter.value, total_tests))
+ else:
+ sys.stderr.write("\n%d out of %d test suites processed" %
+ (test_counter.value, total_tests))
test_counter.value += 1
- sys.stderr.flush()
+ sys.stdout.flush()
+ sys.stderr.flush()
def parse_test_results(output):
passes = 0
@@ -126,7 +142,11 @@
output = process.communicate()
exit_status = process.returncode
passes, failures = parse_test_results(output)
- update_status(name, command, output if exit_status != 0 else None)
+ if exit_status == 0:
+ # stdout does not have any useful information from 'dotest.py', only stderr does.
+ report_test_pass(name, output[1])
+ else:
+ report_test_failure(name, command, output[1])
return exit_status, passes, failures
def process_dir(root, files, test_root, dotest_argv):
@@ -194,11 +214,11 @@
test_work_items.append((root, files, test_directory, dotest_argv))
global output_lock, test_counter, total_tests
- output_lock = multiprocessing.Lock()
+ output_lock = multiprocessing.RLock()
total_tests = len(test_work_items)
test_counter = multiprocessing.Value('i', 0)
print >> sys.stderr, "Testing: %d tests, %d threads" % (total_tests, num_threads)
- update_status()
+ update_progress(None, None)
# Run the items, either in a pool (for multicore speedup) or
# calling each individually.
@@ -327,6 +347,12 @@
dest='dotest_options',
help="""The options passed to 'dotest.py' if specified.""")
+ parser.add_option('-s', '--output-on-success',
+ action='store_true',
+ dest='output_on_success',
+ default=False,
+ help="""Print full output of 'dotest.py' even when it succeeds.""")
+
parser.add_option('-t', '--threads',
type='int',
dest='num_threads',
@@ -340,6 +366,8 @@
parser = dotest_args.create_parser()
global dotest_options
+ global output_on_success
+ output_on_success = opts.output_on_success
dotest_options = dotest_args.parse_args(parser, dotest_argv)
if not dotest_options.s:
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
