[cargo-miri] Don't skip rlib crates
#1709
Conversation
test-cargo-miri/src/lib.rs
Outdated
| @@ -3,5 +3,5 @@ | |||
| /// assert!(cargo_miri_test::make_true()); | |||
| /// ``` | |||
| pub fn make_true() -> bool { | |||
| true | |||
| rlib_dep::use_me() | |||
There was a problem hiding this comment.
Confirmed that current nightly cargo-miri fails here:
## Running `cargo miri` tests
A libstd for Miri is now available in `/my/home/directory/.cache/miri/HOST`.
Testing `cargo miri run` (no isolation)...
--- BEGIN stdout ---
--- END stdout ---
--- BEGIN stderr ---
error: extern location for rlib_dep does not exist: /my/home/directory/miri/test-cargo-miri/target/x86_64-unknown-linux-gnu/debug/deps/librlib_dep-095fd0061894c932.rmeta
--> src/lib.rs:6:5
|
6 | rlib_dep::use_me()
| ^^^^^^^^
error: aborting due to previous error
error: could not compile `cargo-miri-test`
To learn more, run the command again with --verbose.
--- END stderr ---
TEST FAIL: exit code was 101
| match get_arg_flag_value("--crate-type").as_deref() { | ||
| Some("rlib") | Some("cdylib") => { | ||
| if verbose { | ||
| eprint!("[cargo-miri rustc] (rlib/cdylib skipped)"); | ||
| } | ||
| return; | ||
| if get_arg_flag_value("--crate-type").as_deref() == Some("cdylib") { | ||
| if verbose { | ||
| eprint!("[cargo-miri rustc] (cdylib skipped)"); | ||
| } | ||
| _ => {}, | ||
| return; |
There was a problem hiding this comment.
I found that skipping the crate if get_arg_flag_value("--crate-type") is something is probably wrong, because Cargo passes multiple --crate-type to the compiler.
If I add
issue_1567::use_the_dependency();to test-cargo-miri/src/lib.rs, the test will fail:
## Running `cargo miri` tests
A libstd for Miri is now available in `/my/home/directory/.cache/miri/HOST`.
Testing `cargo miri run` (no isolation)...
--- BEGIN stdout ---
--- END stdout ---
--- BEGIN stderr ---
error: extern location for issue_1567 does not exist: /my/home/directory/miri/test-cargo-miri/target/x86_64-unknown-linux-gnu/debug/deps/libissue_1567.rmeta
--> src/lib.rs:6:5
|
6 | issue_1567::use_the_dependency();
| ^^^^^^^^^^
error: aborting due to previous error
error: could not compile `cargo-miri-test`
To learn more, run the command again with --verbose.
--- END stderr ---
TEST FAIL: exit code was 101
I think that is because Cargo passes both --crate-type cdylib and --crate-type rlib to the compiler and only invokes the compiler once. If cargo-miri skips the crate here, the rlib won't be produced.
Maybe just dropping --crate-type cdylib and continuing to compile with only --crate-type rlib (or skip the compilation if there's no more --crate-type) makes more sense.
(EDIT: Hit #1705 when experimenting with that... Trying to fix that together...)
There was a problem hiding this comment.
|
Thanks for the PR. :) |
|
Looking good, thanks for your help in working out the kinks of cargo-miri! |
|
📌 Commit 0737de8 has been approved by |
ghost
mentioned this pull request
|
☀️ Test successful - checks-actions |
ghost
deleted the
Fixes #1691.