Merged
Conversation
Signed-off-by: Kiskae <Kiskae@users.noreply.github.com>
Kiskae
commented
Jun 4, 2024
| check_fsverity () { | ||
| fsverity --version >/dev/null 2>&1 || return 1 | ||
| tmpfile=$(mktemp /var/tmp/lcfs-fsverity.XXXXXX) | ||
| tmpfile=$(mktemp --tmpdir lcfs-fsverity.XXXXXX) |
Contributor
Author
There was a problem hiding this comment.
Specifically this, its probably a better idea to override $TMPDIR before test-lib.sh is loaded to get fsverify support.
Maybe something like:
if [[ -z "${COMPOSEFS_FSVERITY_USE_TMPDIR:-}" ]]; then
TMPDIR="/var/tmp"
fi
Contributor
There was a problem hiding this comment.
Yeah, our default CI here using Ubuntu has use_fsverity=n which we need to fix anyways independently of this, and agree that setting TMPDIR externally to the tests is right.
cgwalters
approved these changes
Jun 4, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Just upstreaming some things I ran into while I was originally packaging for nixpkgs.
Since the builds happen in a minimal sandbox it was running into non-existing directories.
The only thing I'm not sure about is the tests that involve fsverity since usually
/tmpis atmpfsand might not support it. But in that case it is probably a better idea to specifically set$TMPDIRfor those tests rather than hardcoding/var/tmp