[fix] Apply heuristics when diagtool comes with version number #4515
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bruntib
added a commit
to bruntib/codechecker
that referenced
this pull request
Apr 1, 2025
In some environments "diagtool" doesn't exist with this name, but it exists with a name containing version number: "diagtool-14". In this patch we apply some heuristics to try finding diagtool with this extended name, too. Fixes Ericsson#4515
bruntib
force-pushed
the
diagtool_version
branch
3 times, most recently
from
c53dcab to
fb694a6
Compare
cservakt
reviewed
Apr 7, 2025
| @@ -154,6 +154,12 @@ def get_diagtool_bin(): | |||
| if diagtool_bin.exists(): | |||
| return diagtool_bin | |||
|
|
|||
| # Sometimes diagtool binary has a version number in its name: diagtool-14. | |||
| diagtool_bin = diagtool_bin.with_name( | |||
| 'diagtool-' + str(ClangSA.version_info().major_version)) | |||
There was a problem hiding this comment.
Can we use f-string here instead of string concatenation?
In some environments "diagtool" doesn't exist with this name, but it exists with a name containing version number: "diagtool-14". In this patch we apply some heuristics to try finding diagtool with this extended name, too. Fixes Ericsson#4453
bruntib
force-pushed
the
diagtool_version
branch
from
fb694a6 to
d3e9313
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In some environments "diagtool" doesn't exist with this name, but it exists with a name containing version number: "diagtool-14". In this patch we apply some heuristics to try finding diagtool with this extended name, too.
Fixes #4453