Skip to content

Commit 41510cc

Browse files
authored
Rollup merge of rust-lang#143825 - RalfJung:clippy-test-filter, r=llogiq
clippy: fix test filtering when TESTNAME is empty Fixes rust-lang#143824. Turns out bootstrap was just fine, the TESTNAME logic in clippy was wrong... I still made this a rustc PR as that's where I did all the debugging. The bootstrap change is not really related, but it's comment-only so not worth a separate PR... adding the `test_args` is also part of what `prepare_cargo_test` would usually do so let's group the code properly.
2 parents 519ad87 + 0cc6061 commit 41510cc

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

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)