Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coverage.py: Guard use of --html-nested behind version check. #13782

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

amcn
Copy link
Contributor

@amcn amcn commented Oct 12, 2024

--html-nested was added to gcovr in version 6.0 so passing it to versions before this will result in gcovr complaining that it doesn't recognise the argument.

Added a version check to ensure that we pass a recognised argument for versions before 6.0

Fixes #13781

@amcn amcn requested a review from jpakkane as a code owner October 12, 2024 10:19
@amcn
Copy link
Contributor Author

amcn commented Nov 2, 2024

@eli-schwartz Apologies for the explicit ping, but it seems that others have now started to encounter the underlying bug in the wild: dftd4/dftd4#264 (comment)

Could this fix be reviewed and (if it's acceptable) merged for the next release?

The logs for the Windows CI failure have expired at this point, but IIRC it was the two hour timeout that caused it to fail.

@dcbaker dcbaker added this to the 1.6.1 milestone Nov 4, 2024
@dcbaker
Copy link
Member

dcbaker commented Nov 4, 2024

I tired to kick the azure pipelines, but they don't want to be kicked, a force push might be required to get them going again

@amcn
Copy link
Contributor Author

amcn commented Nov 4, 2024

Oh joy, the Windows CI passes now in just over an hour, but the cross-compile armhf job failed, with the following error:

  ERROR: Clock skew detected. File /__w/meson/meson/b 473e503e48/../test cases/common/273 both libraries/meson.build has a time stamp 0.0063s in the future.

Which seems to be a sporadic. I can re-run this again if it's desired.

`--html-nested` was added to gcovr in version 6.0 so passing
it to versions before this will result in gcovr complaining that
it doesn't recognise the argument.

Added a version check to ensure that we pass a recognised argument
for versions before 6.0

Fixes mesonbuild#13781
@eli-schwartz eli-schwartz merged commit 4c7226e into mesonbuild:master Nov 5, 2024
33 checks passed
@eli-schwartz
Copy link
Member

@eli-schwartz Apologies for the explicit ping, but it seems that others have now started to encounter the underlying bug in the wild

No problem, you can always feel free to ping me if you think something slipped under the radar.

In this case, something did :) when you originally submitted this PR, I was offline for the holiday season and there were quite a few things that built up and I didn't notice, so pinging me now means I notice it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

gcovr html coverage generation fails due to unknown argument supplied by meson
3 participants