Resolve mounts host_path relatively to vmtest.toml #94
Conversation
This file contains 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
akerouanton
force-pushed
the
relative-mounts
branch
2 times, most recently
from
3e7a558 to
8466295
Compare
danobi
reviewed
Nov 19, 2024
src/vmtest.rs
Outdated
| .map(|(k, v)| { | ||
| let mut m = v.clone(); | ||
| m.host_path = self.resolve_path(v.host_path.as_path()); | ||
| (k.clone(), m) |
There was a problem hiding this comment.
should be possible to modify in-place? Given we already have a mut target cloned above. don't worry about it if it's complicated - just a nit
akerouanton
force-pushed
the
relative-mounts
branch
from
8466295 to
334ff94
Compare
|
needs a rustfmt fix |
When a non-default `rootfs` is used, and vmtest is run through `go test -exec`, the binary executed within the VM can't be found, because that rootfs doesn't contain the test binary compiled on the fly. So a custom mount has to be specified. But, before that commit, if a relative `host_path` was used, it'd be passed as is to qemu, and thus would be resolved as relative to the cwd where qemu was running. In the case of Go, if a directory was passed to `go test` (eg. `./integration/...`), and `GOTMPDIR=.` was set, Go would compile the test binary within its original cwd (eg. project root dir), and then launch vmtest in the 'directory under test' (eg. `./integration`), so the relative mount would resolve to the directory where vmtest was started (eg. `./integration`) -- a directory that doesn't contain the test binary. To fix this mismatch, resolve `host_path` relative to the `vmtest.toml` file. FWIW this doesn't fully solve the original issue, unless the VM path put in the config file is hardcoded to the cwd of `go test -exec`. To overcome this, one can prepend the inline command with a call to `mkdir` + `ln`: ```sh GOTMPDIR=. go test -exec "vmtest -c $(pwd)/vmtest.toml -- mkdir $(realpath ..); ln -s /skbdump/ $(pwd); " ./integration/... ``` Signed-off-by: Albin Kerouanton <albinker@gmail.com>
akerouanton
force-pushed
the
relative-mounts
branch
from
334ff94 to
fa1a99f
Compare
danobi
approved these changes
Dec 3, 2024
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.
When a non-default
rootfsis used, and vmtest is run throughgo test -exec, the binary executed within the VM can't be found, because that rootfs doesn't contain the test binary compiled on the fly. So a custom mount has to be specified.But, before that commit, if a relative
host_pathwas used, it'd be passed as is to qemu, and thus would be resolved as relative to the cwd where qemu was running.In the case of Go, if a directory was passed to
go test(eg../integration/...), andGOTMPDIR=.was set, Go would compile the test binary within its original cwd (eg. project root dir), and then launch vmtest in the 'directory under test' (eg../integration), so the relative mount would resolve to the directory where vmtest was started (eg../integration) -- a directory that doesn't contain the test binary.To fix this mismatch, resolve
host_pathrelative to thevmtest.tomlfile.FWIW this doesn't fully solve the original issue, unless the VM path put in the config file is hardcoded to the cwd of
go test -exec. To overcome this, one can prepend the inline command with a call tomkdir+ln: