-
Notifications
You must be signed in to change notification settings - Fork 262
Install FileCheck
for older (apt
-based) distros
#770
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
Merged
Merged
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
aneksteind
approved these changes
Jan 9, 2023
tagging @thedataking for |
0c586ec
to
9196d73
Compare
thedataking
requested changes
Jan 10, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to know if dropping LLVM 6 support would simplify the provisioning change you are proposing.
These older distros/default LLVM versions require the `llvm-${major}-tools` or `llvm-${major}.${minor}-tools` packages, while newer ones install `FileCheck` automatically.
9196d73
to
1e80811
Compare
kkysen
added a commit
that referenced
this pull request
Jan 14, 2023
It used to be there as the script ran in CI, but it no longer is, so we don't need to retry anymore. See #770 (comment).
kkysen
added a commit
that referenced
this pull request
Jan 18, 2023
It used to be there as the script ran in CI, but it no longer is, so we don't need to retry anymore. See #770 (comment).
thedataking
pushed a commit
that referenced
this pull request
Jan 19, 2023
It used to be there as the script ran in CI, but it no longer is, so we don't need to retry anymore. See #770 (comment).
@thedataking said it looks better, so I'll merge now. |
bytewife
pushed a commit
to bytewife/c2rust
that referenced
this pull request
Jan 26, 2023
It used to be there as the script ran in CI, but it no longer is, so we don't need to retry anymore. See immunant#770 (comment).
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.
cargo test -p c2rust-analyze
fails CI due to noFileCheck
#593, along with the changes just merged in Add more comprehensive searching forFileCheck
using$(llvm_config --bindir)/FileCheck
#767.This installs
FileCheck
for older (apt
-based) distros so that we can useFileCheck
in testing without having to disable it anywhere. Notably, we can useFileCheck
forc2rust-analyze
tests.These older distros/default LLVM versions require the
llvm-${major}-tools
orllvm-${major}.${minor}-tools
packages, while newer ones installFileCheck
automatically, so this adds the installation of the older versions ifFileCheck
is not found in the expected location,$(llvm-config --bindir)/FileCheck
, using the samellvm-config
resolution used elsewhere.This changes the docker builds, so we'll need a
./scripts/docker_build.sh push-all
.This also adds an array of packages in the script, which makes adding to it easier, as well as allowing for inline comments (which don't work with
\
line continuation).