Skip to content

Commit 73edfe7

Browse files
committed
clippy: fix test filtering when TESTNAME is empty
1 parent 855e0fe commit 73edfe7

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/bootstrap/src/core/build_steps/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,9 @@ impl Step for CargoMiri {
680680
cargo.arg("--doc");
681681
}
682682
}
683-
684-
// Finally, pass test-args and run everything.
685683
cargo.arg("--").args(builder.config.test_args());
684+
685+
// Finally, run everything.
686686
let mut cargo = BootstrapCommand::from(cargo);
687687
{
688688
let _guard = builder.msg_sysroot_tool(Kind::Test, stage, "cargo-miri", host, target);

src/tools/clippy/tests/compile-test.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,17 @@ impl TestContext {
144144
let target_dir = PathBuf::from(var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into()));
145145
let mut config = Config {
146146
output_conflict_handling: error_on_output_conflict,
147+
// Pre-fill filters with TESTNAME; will be later extended with `self.args`.
147148
filter_files: env::var("TESTNAME")
148-
.map(|filters| filters.split(',').map(str::to_string).collect())
149+
.map(|filters| {
150+
filters
151+
.split(',')
152+
// Make sure that if TESTNAME is empty we produce the empty list here,
153+
// not a list containing an empty string.
154+
.filter(|s| !s.is_empty())
155+
.map(str::to_string)
156+
.collect()
157+
})
149158
.unwrap_or_default(),
150159
target: None,
151160
bless_command: Some(if IS_RUSTC_TEST_SUITE {

0 commit comments

Comments
 (0)