From f0b8da4430971ce1a34848852849b8b4e3f20778 Mon Sep 17 00:00:00 2001
From: Oneirical <manchot@videotron.ca>
Date: Fri, 17 May 2024 13:29:43 -0400
Subject: [PATCH] rewrite no-intermediate-extras

---
 .../tidy/src/allowed_run_make_makefiles.txt   |  1 -
 .../run-make/no-intermediate-extras/Makefile  |  8 -------
 .../run-make/no-intermediate-extras/rmake.rs  | 21 +++++++++++++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)
 delete mode 100644 tests/run-make/no-intermediate-extras/Makefile
 create mode 100644 tests/run-make/no-intermediate-extras/rmake.rs

diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
index 1a3d6f8d813..4f0397357ae 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -179,7 +179,6 @@ run-make/no-alloc-shim/Makefile
 run-make/no-builtins-attribute/Makefile
 run-make/no-builtins-lto/Makefile
 run-make/no-duplicate-libs/Makefile
-run-make/no-intermediate-extras/Makefile
 run-make/obey-crate-type-flag/Makefile
 run-make/optimization-remarks-dir-pgo/Makefile
 run-make/optimization-remarks-dir/Makefile
diff --git a/tests/run-make/no-intermediate-extras/Makefile b/tests/run-make/no-intermediate-extras/Makefile
deleted file mode 100644
index 83b5cedcf2a..00000000000
--- a/tests/run-make/no-intermediate-extras/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# ignore-cross-compile
-# Regression test for issue #10973
-
-include ../tools.mk
-
-all:
-	$(RUSTC) --crate-type=rlib --test foo.rs
-	rm $(TMPDIR)/foo.bc && exit 1 || exit 0
diff --git a/tests/run-make/no-intermediate-extras/rmake.rs b/tests/run-make/no-intermediate-extras/rmake.rs
new file mode 100644
index 00000000000..4ca95a1538d
--- /dev/null
+++ b/tests/run-make/no-intermediate-extras/rmake.rs
@@ -0,0 +1,21 @@
+// When using the --test flag with an rlib, this used to generate
+// an unwanted .bc file, which should not exist. This test checks
+// that the bug causing the generation of this file has not returned.
+// See https://github.com/rust-lang/rust/issues/10973
+
+//@ ignore-cross-compile
+
+use run_make_support::{rustc, tmp_dir};
+
+fn main() {
+    rustc().crate_type("rlib").arg("--test").input("foo.rs").run(); 
+    match fs::remove_file(tmp_dir().join("foo.bc")) {
+        Ok(_) => {
+            println!("An unwanted .bc file was created by run-make/no-intermediate-extras.");
+            std::process::exit(0);
+        },
+        Err(e) => {
+            std::process::exit(1);
+        }
+    }
+}