Skip to content

Commit 5de588f

Browse files
committed
Merge branch 'eyraud/test_256' into 'master'
Do not use gpr_common_args in xcov_suite_args See merge request eng/das/cov/gnatcoverage!725 gpr_common_args passes the -v switch when the testsuite is run in qualification mode, which results in passing `-v` to every gnatcov invocation, yielding regressions. For eng/das/cov/gnatcoverage#256
2 parents d01b669 + 70231a3 commit 5de588f

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

testsuite/SUITE/tutils.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -729,11 +729,17 @@ def xcov_suite_args(
729729
or any(arg.startswith("-P") for arg in covargs)
730730
)
731731

732-
result = (
733-
gpr_common_args(project=None, auto_config_args=auto_config_args)
734-
if project_handling_enabled
735-
else []
736-
)
732+
result = []
733+
734+
# If --config is asked and project handling is involved, pass it and stop
735+
# there. If there is a board, it must be described in the project file
736+
# (gnatcov's -P argument).
737+
if project_handling_enabled and auto_config_args:
738+
result.append(
739+
"--config={}".format(os.path.join(ROOT_DIR, BUILDER.SUITE_CGPR))
740+
)
741+
result.extend(RUNTIME_INFO.gpr_scenario_vars)
742+
return result
737743

738744
# If --config is asked and project handling is involved, pass it and stop
739745
# there. If there is a board, it must be described in the project file

0 commit comments

Comments
 (0)