Skip to content

Commit cf75dd4

Browse files
authored
Remove incremental test, disable incremental for cargo tests (#14910)
Fixes #11126 It avoids the ICE when the number of lints changes, this is only a problem for clippy in development but cleaning the clippy dir requires a lot of rebuilding changelog: none
2 parents c90c7c4 + 4f3d529 commit cf75dd4

File tree

4 files changed

+4
-37
lines changed

4 files changed

+4
-37
lines changed

tests/compile-test.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,10 @@ fn run_ui_cargo(cx: &TestContext) {
273273
config.program.input_file_flag = CommandBuilder::cargo().input_file_flag;
274274
config.program.out_dir_flag = CommandBuilder::cargo().out_dir_flag;
275275
config.program.args = vec!["clippy".into(), "--color".into(), "never".into(), "--quiet".into()];
276-
config
277-
.program
278-
.envs
279-
.push(("RUSTFLAGS".into(), Some("-Dwarnings".into())));
276+
config.program.envs.extend([
277+
("RUSTFLAGS".into(), Some("-Dwarnings".into())),
278+
("CARGO_INCREMENTAL".into(), Some("0".into())),
279+
]);
280280
// We need to do this while we still have a rustc in the `program` field.
281281
config.fill_host_and_target().unwrap();
282282
config.program.program.set_file_name(if cfg!(windows) {

tests/ui/to_string_in_format_args_incremental.fixed

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/ui/to_string_in_format_args_incremental.rs

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/ui/to_string_in_format_args_incremental.stderr

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)