user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clippy: fix test filtering when TESTNAME is empty

Browse source
This commit is contained in:
Ralf Jung 2025-07-12 11:08:30 +02:00
parent 855e0fe46e
commit 73edfe7b73
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/src/core/build_steps/test.rs
View file

@ -680,9 +680,9 @@ impl Step for CargoMiri {
cargo.arg("--doc");
}
}
// Finally, pass test-args and run everything.
cargo.arg("--").args(builder.config.test_args());
// Finally, run everything.
let mut cargo = BootstrapCommand::from(cargo);
{
let _guard = builder.msg_sysroot_tool(Kind::Test, stage, "cargo-miri", host, target);

11
src/tools/clippy/tests/compile-test.rs
View file

@ -144,8 +144,17 @@ impl TestContext {
let target_dir = PathBuf::from(var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into()));
let mut config = Config {
output_conflict_handling: error_on_output_conflict,
// Pre-fill filters with TESTNAME; will be later extended with `self.args`.
filter_files: env::var("TESTNAME")
.map(|filters| filters.split(',').map(str::to_string).collect())
.map(|filters| {
filters
.split(',')
// Make sure that if TESTNAME is empty we produce the empty list here,
// not a list containing an empty string.
.filter(|s| !s.is_empty())
.map(str::to_string)
.collect()
})
.unwrap_or_default(),
target: None,
bless_command: Some(if IS_RUSTC_TEST_SUITE {