Skip to content

Adjust test detection for new build-dir layout of cargo #112

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.

Sign up for GitHub

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
phil-opp merged 1 commit into from
Aug 3, 2026
+18 −4
Merged

Adjust test detection for new build-dir layout of cargo #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,27 @@ pub(crate) fn runner(args: RunnerArgs) -> Result<i32> {
.executable
.parent()
.ok_or_else(|| anyhow!("kernel executable has no parent"))?;
let is_doctest = exe_parent
let exe_parent_name = exe_parent
.file_name()
.ok_or_else(|| anyhow!("kernel executable's parent has no file name"))?
.to_str()
.ok_or_else(|| anyhow!("kernel executable's parent file name is not valid UTF-8"))?
.starts_with("rustdoctest");
let is_test = is_doctest || exe_parent.ends_with("deps");
.ok_or_else(|| anyhow!("kernel executable's parent file name is not valid UTF-8"))?;
let is_doctest = exe_parent_name.starts_with("rustdoctest");
// Cargo compiles test and benchmark executables into a separate directory,
// which lets us distinguish them from normal `run` binaries.
//
// - In the classic build-dir layout they live in `<profile>/deps/`.
// - Since the build-dir layout v2 (nightly, rust-lang/cargo#17258) they
// live in `<profile>/build/<pkg>/<hash>/out/` instead, i.e. the `out`
// directory's third ancestor is the `build` directory.
let is_test = is_doctest
|| exe_parent_name == "deps"
|| (exe_parent_name == "out"
&& exe_parent
.ancestors()
.nth(3)
.and_then(|ancestor| ancestor.file_name())
== Some("build".as_ref()));

let bin_name = args
.executable
Expand Down
Loading