coverage.py: only print dist, mode, variant and format for failed jobs if necessary

This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-10-16 15:30:17 +02:00
parent 3a17a91b3c
commit f0f211f383
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -119,6 +119,19 @@ def parse_config(confname):
return config_order, config_dict return config_order, config_dict
def format_failed(num, total, name, dist, mode, variant, fmt, config_dict):
ret = f"({num}/{total}) {name}"
if len(config_dict[name].get("Dists", [])) > 0:
ret += f" --dist={dist}"
if len(config_dict[name].get("Modes", [])) > 0:
ret += f" --mode={mode}"
if len(config_dict[name].get("Variants", [])) > 0:
ret += f" --variant={variant}"
if len(config_dict[name].get("Formats", [])) > 0:
ret += f" --format={fmt}"
return ret
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("test", nargs="*", help="only run these tests") parser.add_argument("test", nargs="*", help="only run these tests")
@ -319,7 +332,9 @@ def main():
print(separator, file=sys.stderr) print(separator, file=sys.stderr)
if proc.returncode != 0: if proc.returncode != 0:
failed.append( failed.append(
("(%d/%d) %s" % (i + 1, len(tests), name), dist, mode, variant, fmt) format_failed(
i + 1, len(tests), name, dist, mode, variant, fmt, config_dict
)
) )
print("result: FAILURE", file=sys.stderr) print("result: FAILURE", file=sys.stderr)
else: else:
@ -339,11 +354,8 @@ def main():
print(f" {t}", file=sys.stderr) print(f" {t}", file=sys.stderr)
if failed: if failed:
print("failed %d:" % len(failed), file=sys.stderr) print("failed %d:" % len(failed), file=sys.stderr)
for name, dist, mode, variant, fmt in failed: for f in failed:
print( print(f, file=sys.stderr)
f" {name} --dist={dist} --mode={mode} --variant={variant} --format={fmt}",
file=sys.stderr,
)
exit(1) exit(1)