From fa9416426adda74f41af014dd8b22ce17a7afca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Tue, 14 Jun 2022 23:42:00 +0200 Subject: [PATCH] Refactor shared args in approvalTests.py --- tools/scripts/approvalTests.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/scripts/approvalTests.py b/tools/scripts/approvalTests.py index 3bd9c23f..098f40e3 100755 --- a/tools/scripts/approvalTests.py +++ b/tools/scripts/approvalTests.py @@ -200,23 +200,25 @@ print("Running approvals against executable:") print(" " + cmdPath) +base_args = ["--order", "lex", "--rng-seed", "1", "--colour-mode", "none"] + ## special cases first: # Standard console reporter -approve("console.std", ["~[!nonportable]~[!benchmark]~[approvals] *", "--order", "lex", "--rng-seed", "1", "--colour-mode", "none"]) +approve("console.std", ["~[!nonportable]~[!benchmark]~[approvals] *"] + base_args) # console reporter, include passes, warn about No Assertions, limit failures to first 4 -approve("console.swa4", ["~[!nonportable]~[!benchmark]~[approvals] *", "-s", "-w", "NoAssertions", "-x", "4", "--order", "lex", "--rng-seed", "1", "--colour-mode", "none"]) +approve("console.swa4", ["~[!nonportable]~[!benchmark]~[approvals] *", "-s", "-w", "NoAssertions", "-x", "4"] + base_args) ## Common reporter checks: include passes, warn about No Assertions reporters = ('console', 'junit', 'xml', 'compact', 'sonarqube', 'tap', 'teamcity', 'automake') for reporter in reporters: filename = '{}.sw'.format(reporter) - common_args = ["~[!nonportable]~[!benchmark]~[approvals] *", "-s", "-w", "NoAssertions", "--order", "lex", "--rng-seed", "1", "--colour-mode", "none"] + common_args = ["~[!nonportable]~[!benchmark]~[approvals] *", "-s", "-w", "NoAssertions"] + base_args reporter_args = ['-r', reporter] approve(filename, common_args + reporter_args) ## All reporters at the same time -common_args = ["~[!nonportable]~[!benchmark]~[approvals] *", "-s", "-w", "NoAssertions", "--order", "lex", "--rng-seed", "1", "--colour-mode", "none"] +common_args = ["~[!nonportable]~[!benchmark]~[approvals] *", "-s", "-w", "NoAssertions"] + base_args filenames = ['{}.sw.multi'.format(reporter) for reporter in reporters] reporter_args = [] for reporter, filename in zip(reporters, filenames):