Commit 6e2c8d0c authored by Stefan Behnel's avatar Stefan Behnel

runtests: Improve exception output.

parent 9494ec3b
...@@ -2514,21 +2514,18 @@ def runtests(options, cmd_args, coverage=None): ...@@ -2514,21 +2514,18 @@ def runtests(options, cmd_args, coverage=None):
# Run the collected tests. # Run the collected tests.
try: try:
if options.shard_num > -1: if options.shard_num > -1:
sys.stderr.write("Tests in shard %d starting" % options.shard_num) sys.stderr.write("Tests in shard %d/%d starting\n" % (options.shard_num, options.shard_count))
result = test_runner.run(test_suite) result = test_runner.run(test_suite)
except Exception as exc: except Exception as exc:
# Make sure we print exceptions also from shards. # Make sure we print exceptions also from shards.
if options.shard_num > -1: if options.shard_num > -1:
sys.stderr.write("Tests in shard %d crashed: %s" % (options.shard_num, exc)) sys.stderr.write("Tests in shard %d/%d crashed: %s\n" % (options.shard_num, options.shard_count, exc))
import traceback import traceback
traceback.print_exc() traceback.print_exc()
raise raise
finally: finally:
if enable_faulthandler: if enable_faulthandler:
faulthandler.disable() faulthandler.disable()
if options.shard_num > -1:
sys.stderr.write("Tests in shard %d terminated (%s)" % (
options.shard_num, sys.exc_info()[1] or "no crash"))
if common_utility_dir and options.shard_num < 0 and options.cleanup_workdir: if common_utility_dir and options.shard_num < 0 and options.cleanup_workdir:
shutil.rmtree(common_utility_dir) shutil.rmtree(common_utility_dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment