diff options
| author | bors <bors@rust-lang.org> | 2024-04-01 16:16:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-01 16:16:16 +0000 |
| commit | 41e814a554e4eb2dcd65024bf7e43ffdbe504087 (patch) | |
| tree | 85d87407d80e5d26c6c510dbe1dee91f3b40b709 | |
| parent | c2681f2338c2fbeaeb87cda1c19bc7e9cd95f2f4 (diff) | |
| parent | 24d20b4eae2646e79a7aba6a691ef39127431882 (diff) | |
| download | rust-41e814a554e4eb2dcd65024bf7e43ffdbe504087.tar.gz rust-41e814a554e4eb2dcd65024bf7e43ffdbe504087.zip | |
Auto merge of #12605 - xFrednet:00000-ignore-ice, r=y21
Ignore `rustc-ice-` files When ui-test detects a crash, it writes it into a `rustc-ice-*` file. I find it a bit annoying that git always want's to add them. So this just adds these files to our `.gitignore` :D --- changelog: none
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | clippy_dev/src/lint.rs | 4 | ||||
| -rw-r--r-- | tests/compile-test.rs | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 503ae3c5090..181b71a658b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Generated by ui-test +rustc-ice-* + # Used by CI to be able to push: /.github/deploy_key out diff --git a/clippy_dev/src/lint.rs b/clippy_dev/src/lint.rs index 906a9727810..f308f5dfdfd 100644 --- a/clippy_dev/src/lint.rs +++ b/clippy_dev/src/lint.rs @@ -20,6 +20,8 @@ pub fn run<'a>(path: &str, args: impl Iterator<Item = &'a String>) { .args(["--edition", "2021"]) .arg(path) .args(args) + // Prevent rustc from creating `rustc-ice-*` files the console output is enough. + .env("RUSTC_ICE", "0") .status(), ); } else { @@ -32,6 +34,8 @@ pub fn run<'a>(path: &str, args: impl Iterator<Item = &'a String>) { let status = Command::new(cargo_clippy_path()) .arg("clippy") .args(args) + // Prevent rustc from creating `rustc-ice-*` files the console output is enough. + .env("RUSTC_ICE", "0") .current_dir(path) .status(); diff --git a/tests/compile-test.rs b/tests/compile-test.rs index a0c8bf9334c..32a31f5e082 100644 --- a/tests/compile-test.rs +++ b/tests/compile-test.rs @@ -146,6 +146,8 @@ fn base_config(test_dir: &str) -> (Config, Args) { ); config.program.args.extend(EXTERN_FLAGS.iter().map(OsString::from)); + // Prevent rustc from creating `rustc-ice-*` files the console output is enough. + config.program.envs.push(("RUSTC_ICE".into(), Some("0".into()))); if let Some(host_libs) = option_env!("HOST_LIBS") { let dep = format!("-Ldependency={}", Path::new(host_libs).join("deps").display()); |
