From 79cf61a9aeb83ce030ba9db59e79a93a9c507040 Mon Sep 17 00:00:00 2001
From: Julien <96022417+Oneirical@users.noreply.github.com>
Date: Tue, 7 May 2024 09:39:57 -0400
Subject: [PATCH 1/3] Update Makefiles with explanatory comments

---
 tests/run-make/alloc-no-oom-handling/Makefile        | 3 +++
 tests/run-make/alloc-no-rc/Makefile                  | 3 +++
 tests/run-make/alloc-no-sync/Makefile                | 3 +++
 tests/run-make/allocator-shim-circular-deps/Makefile | 3 +++
 tests/run-make/archive-duplicate-names/Makefile      | 3 +++
 tests/run-make/bare-outfile/Makefile                 | 2 ++
 tests/run-make/c-dynamic-dylib/Makefile              | 3 +++
 tests/run-make/c-dynamic-rlib/Makefile               | 3 +++
 tests/run-make/c-link-to-rust-dylib/Makefile         | 3 +++
 tests/run-make/c-link-to-rust-staticlib/Makefile     | 3 +++
 tests/run-make/c-static-dylib/Makefile               | 3 +++
 tests/run-make/c-static-rlib/Makefile                | 3 +++
 tests/run-make/c-unwind-abi-catch-lib-panic/Makefile | 3 +++
 tests/run-make/c-unwind-abi-catch-panic/Makefile     | 3 +++
 tests/run-make/cat-and-grep-sanity-check/Makefile    | 4 ++++
 tests/run-make/cdylib-dylib-linkage/Makefile         | 3 +++
 tests/run-make/cdylib-fewer-symbols/Makefile         | 2 ++
 tests/run-make/cdylib/Makefile                       | 3 +++
 tests/run-make/codegen-options-parsing/Makefile      | 2 ++
 tests/run-make/comment-section/Makefile              | 3 +++
 tests/run-make/compile-stdin/Makefile                | 3 +++
 tests/run-make/compiler-lookup-paths-2/Makefile      | 3 +++
 tests/run-make/compiler-lookup-paths/Makefile        | 3 +++
 23 files changed, 67 insertions(+)

diff --git a/tests/run-make/alloc-no-oom-handling/Makefile b/tests/run-make/alloc-no-oom-handling/Makefile
index 87f74c69c7939..2f053f4025b62 100644
--- a/tests/run-make/alloc-no-oom-handling/Makefile
+++ b/tests/run-make/alloc-no-oom-handling/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that the Rust compiler can still compile correctly when the unstable no_global_oom_handling feature is turned on, which disables global error handling in alloc.
+# See https://github.com/rust-lang/rust/pull/84266
+
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/alloc-no-rc/Makefile b/tests/run-make/alloc-no-rc/Makefile
index 9824b17e6c2a7..f7422dec3a57d 100644
--- a/tests/run-make/alloc-no-rc/Makefile
+++ b/tests/run-make/alloc-no-rc/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that the Rust compiler can still compile correctly when the unstable no_rc feature is turned on, which disables rc in alloc.
+# See https://github.com/rust-lang/rust/pull/89891
+
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/alloc-no-sync/Makefile b/tests/run-make/alloc-no-sync/Makefile
index 04ec4c7d8bc9a..16db6404fa260 100644
--- a/tests/run-make/alloc-no-sync/Makefile
+++ b/tests/run-make/alloc-no-sync/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that the Rust compiler can still compile correctly when the unstable no_sync feature is turned on, which disables sync in alloc.
+# See https://github.com/rust-lang/rust/pull/89891
+
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/allocator-shim-circular-deps/Makefile b/tests/run-make/allocator-shim-circular-deps/Makefile
index 4624b84680369..04531503eab69 100644
--- a/tests/run-make/allocator-shim-circular-deps/Makefile
+++ b/tests/run-make/allocator-shim-circular-deps/Makefile
@@ -1,3 +1,6 @@
+# This test intentionally creates a circular dependency, and checks if this causes the resurgence of the compiler bug linked below.
+# See https://github.com/rust-lang/rust/issues/112715
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/archive-duplicate-names/Makefile b/tests/run-make/archive-duplicate-names/Makefile
index 5433a42d25286..a9a3373ac5616 100644
--- a/tests/run-make/archive-duplicate-names/Makefile
+++ b/tests/run-make/archive-duplicate-names/Makefile
@@ -1,3 +1,6 @@
+# This test reads two object archives with the same filename, and extracts each one to a unique location. This checks that the functionality of the linked PR is preserved.
+# See https://github.com/rust-lang/rust/pull/24439
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/bare-outfile/Makefile b/tests/run-make/bare-outfile/Makefile
index 23b619ea0ba32..ad6fe4bd167c4 100644
--- a/tests/run-make/bare-outfile/Makefile
+++ b/tests/run-make/bare-outfile/Makefile
@@ -1,3 +1,5 @@
+# This test checks that manually setting the output file as a bare file with no file extension still results in successful compilation.
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-dynamic-dylib/Makefile b/tests/run-make/c-dynamic-dylib/Makefile
index b5bfbc7653911..d99634ba09a0d 100644
--- a/tests/run-make/c-dynamic-dylib/Makefile
+++ b/tests/run-make/c-dynamic-dylib/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that dynamic Rust linking with C does not encounter any errors, with dynamic dependencies given preference over static.
+# See https://github.com/rust-lang/rust/issues/10434
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-dynamic-rlib/Makefile b/tests/run-make/c-dynamic-rlib/Makefile
index 0475bd8acae5a..8e510dc3cdbcd 100644
--- a/tests/run-make/c-dynamic-rlib/Makefile
+++ b/tests/run-make/c-dynamic-rlib/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that dynamic Rust linking with C does not encounter any errors, with static dependencies given preference over dynamic. (This is the default behaviour.)
+# See https://github.com/rust-lang/rust/issues/10434
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-link-to-rust-dylib/Makefile b/tests/run-make/c-link-to-rust-dylib/Makefile
index 2763cb6ed1d73..79b23eb379135 100644
--- a/tests/run-make/c-link-to-rust-dylib/Makefile
+++ b/tests/run-make/c-link-to-rust-dylib/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that C linking with Rust does not encounter any errors, with dynamic libraries.
+# See https://github.com/rust-lang/rust/issues/10434
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-link-to-rust-staticlib/Makefile b/tests/run-make/c-link-to-rust-staticlib/Makefile
index e14775f5c181c..71a632800d08d 100644
--- a/tests/run-make/c-link-to-rust-staticlib/Makefile
+++ b/tests/run-make/c-link-to-rust-staticlib/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that C linking with Rust does not encounter any errors, with static libraries.
+# See https://github.com/rust-lang/rust/issues/10434
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-static-dylib/Makefile b/tests/run-make/c-static-dylib/Makefile
index 4e23edb6c57a4..b808f46521762 100644
--- a/tests/run-make/c-static-dylib/Makefile
+++ b/tests/run-make/c-static-dylib/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that static Rust linking with C does not encounter any errors, with dynamic dependencies given preference over static.
+# See https://github.com/rust-lang/rust/issues/10434
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-static-rlib/Makefile b/tests/run-make/c-static-rlib/Makefile
index 4e351127cb67c..18a6b2bee071c 100644
--- a/tests/run-make/c-static-rlib/Makefile
+++ b/tests/run-make/c-static-rlib/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that static Rust linking with C does not encounter any errors, with static dependencies given preference over dynamic. (This is the default behaviour.)
+# See https://github.com/rust-lang/rust/issues/10434
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
index b8e0e9483cd9c..2bb8d42495d3c 100644
--- a/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
+++ b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
@@ -1,3 +1,6 @@
+# Exercise unwinding a panic. This catches a panic across an FFI boundary and downcasts it into an integer. The Rust code that panics is in a separate crate.
+# See https://github.com/rust-lang/rust/commit/baf227ea0c1e07fc54395a51e4b3881d701180cb
+
 # ignore-cross-compile
 # needs-unwind
 include ../tools.mk
diff --git a/tests/run-make/c-unwind-abi-catch-panic/Makefile b/tests/run-make/c-unwind-abi-catch-panic/Makefile
index 1760ddb30616f..0a38d838e32a7 100644
--- a/tests/run-make/c-unwind-abi-catch-panic/Makefile
+++ b/tests/run-make/c-unwind-abi-catch-panic/Makefile
@@ -1,3 +1,6 @@
+# Exercise unwinding a panic. This catches a panic across an FFI boundary and downcasts it into an integer. The Rust code that panics is in the same directory.
+# See https://github.com/rust-lang/rust/commit/baf227ea0c1e07fc54395a51e4b3881d701180cb
+
 # ignore-cross-compile
 # needs-unwind
 include ../tools.mk
diff --git a/tests/run-make/cat-and-grep-sanity-check/Makefile b/tests/run-make/cat-and-grep-sanity-check/Makefile
index 82351e22009b2..327c53548492c 100644
--- a/tests/run-make/cat-and-grep-sanity-check/Makefile
+++ b/tests/run-make/cat-and-grep-sanity-check/Makefile
@@ -1,3 +1,7 @@
+# grep in run-make tests was partially replaced with a custom script, CGREP. This tests that CGREP does its job correctly.
+# See https://github.com/rust-lang/rust/commit/ab788a2ee175c7560f0ca58bbc183ecfd57d2f7a
+# Note that this test will likely become useless after the port to rmake.rs tests (see https://github.com/rust-lang/rust/issues/121876)
+
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/cdylib-dylib-linkage/Makefile b/tests/run-make/cdylib-dylib-linkage/Makefile
index 51fbfef2d85f7..9038941504bf2 100644
--- a/tests/run-make/cdylib-dylib-linkage/Makefile
+++ b/tests/run-make/cdylib-dylib-linkage/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that cdylibs can link against dylibs as dependencies, after this restriction was disabled.
+# See https://github.com/rust-lang/rust/commit/72aaa3a414d17aa0c4f19feafa5bab5f84b60e63
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/cdylib-fewer-symbols/Makefile b/tests/run-make/cdylib-fewer-symbols/Makefile
index 4e08f979c36b4..d587cece5bec0 100644
--- a/tests/run-make/cdylib-fewer-symbols/Makefile
+++ b/tests/run-make/cdylib-fewer-symbols/Makefile
@@ -1,6 +1,8 @@
 # ignore-cross-compile
+
 # Test that allocator-related symbols don't show up as exported from a cdylib as
 # they're internal to Rust and not part of the public ABI.
+# See https://github.com/rust-lang/rust/commit/fbf98697021173a30b84d9145df0966a23a2f9d2
 
 include ../tools.mk
 
diff --git a/tests/run-make/cdylib/Makefile b/tests/run-make/cdylib/Makefile
index 3c8b526955452..47a870ef08718 100644
--- a/tests/run-make/cdylib/Makefile
+++ b/tests/run-make/cdylib/Makefile
@@ -1,3 +1,6 @@
+# When the cdylib crate type was added as a variation of dylib, it needed a test to verify its function.
+# See https://github.com/rust-lang/rust/pull/33553
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/codegen-options-parsing/Makefile b/tests/run-make/codegen-options-parsing/Makefile
index 56bb900b7d8e8..c4029f29d289e 100644
--- a/tests/run-make/codegen-options-parsing/Makefile
+++ b/tests/run-make/codegen-options-parsing/Makefile
@@ -1,3 +1,5 @@
+# This test intentionally feeds invalid inputs to codegen and checks if the error message outputs contain the expected strings.
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/comment-section/Makefile b/tests/run-make/comment-section/Makefile
index 9f810063cc86d..d0b98176ffed9 100644
--- a/tests/run-make/comment-section/Makefile
+++ b/tests/run-make/comment-section/Makefile
@@ -1,3 +1,6 @@
+# Both GCC and Clang write by default a `.comment` section with compiler information. Rustc received a similar .comment section, so this tests checks that this section properly appears.
+# See https://github.com/rust-lang/rust/commit/74b8d324eb77a8f337b35dc68ac91b0c2c06debc
+
 include ../tools.mk
 
 # only-linux
diff --git a/tests/run-make/compile-stdin/Makefile b/tests/run-make/compile-stdin/Makefile
index 2a495281c247f..b325b6a6f8783 100644
--- a/tests/run-make/compile-stdin/Makefile
+++ b/tests/run-make/compile-stdin/Makefile
@@ -1,3 +1,6 @@
+# When provided standard input piped directly into rustc, this test verifies that the compilation completes successfully and that the output can be executed.
+# See https://github.com/rust-lang/rust/pull/28805
+
 # ignore-cross-compile
 include ../tools.mk
 
diff --git a/tests/run-make/compiler-lookup-paths-2/Makefile b/tests/run-make/compiler-lookup-paths-2/Makefile
index d4ff7d8daabf9..1ad0e24b0ebb1 100644
--- a/tests/run-make/compiler-lookup-paths-2/Makefile
+++ b/tests/run-make/compiler-lookup-paths-2/Makefile
@@ -1,3 +1,6 @@
+# This test verifies that extern crate declarations in Cargo without a corresponding declaration in the manifest of a dependency are NOT allowed.
+# See https://github.com/rust-lang/rust/pull/21113
+
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/compiler-lookup-paths/Makefile b/tests/run-make/compiler-lookup-paths/Makefile
index 310d6772c342c..fc0cbde4c3524 100644
--- a/tests/run-make/compiler-lookup-paths/Makefile
+++ b/tests/run-make/compiler-lookup-paths/Makefile
@@ -1,3 +1,6 @@
+# rustc supports different types of lookup paths, such as dependency, native or crate. This test checks that these lookup paths are functional and result in functional compilation.
+# See https://github.com/rust-lang/rust/pull/19941
+
 include ../tools.mk
 
 # ignore-wasm32 (need a C compiler)

From 304c183d4fc35a487ac9d8cecf97aec8e3a33bc8 Mon Sep 17 00:00:00 2001
From: Oneirical <manchot@videotron.ca>
Date: Wed, 8 May 2024 21:44:57 -0400
Subject: [PATCH 2/3] correct comments

---
 tests/run-make/alloc-no-oom-handling/Makefile        | 2 +-
 tests/run-make/alloc-no-rc/Makefile                  | 2 +-
 tests/run-make/alloc-no-sync/Makefile                | 2 +-
 tests/run-make/allocator-shim-circular-deps/Makefile | 4 +++-
 tests/run-make/archive-duplicate-names/Makefile      | 3 ++-
 tests/run-make/c-dynamic-dylib/Makefile              | 2 +-
 tests/run-make/c-dynamic-rlib/Makefile               | 2 +-
 tests/run-make/c-link-to-rust-dylib/Makefile         | 2 +-
 tests/run-make/c-link-to-rust-staticlib/Makefile     | 2 +-
 tests/run-make/c-static-dylib/Makefile               | 2 +-
 tests/run-make/c-static-rlib/Makefile                | 2 +-
 tests/run-make/cdylib-dylib-linkage/Makefile         | 2 +-
 tests/run-make/cdylib/Makefile                       | 2 +-
 tests/run-make/codegen-options-parsing/Makefile      | 2 +-
 tests/run-make/compile-stdin/Makefile                | 2 +-
 tests/run-make/compiler-lookup-paths-2/Makefile      | 2 +-
 16 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/tests/run-make/alloc-no-oom-handling/Makefile b/tests/run-make/alloc-no-oom-handling/Makefile
index 2f053f4025b62..7c3ae90b58d67 100644
--- a/tests/run-make/alloc-no-oom-handling/Makefile
+++ b/tests/run-make/alloc-no-oom-handling/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that the Rust compiler can still compile correctly when the unstable no_global_oom_handling feature is turned on, which disables global error handling in alloc.
+# This test checks that alloc can still compile correctly when the unstable no_global_oom_handling feature is turned on.
 # See https://github.com/rust-lang/rust/pull/84266
 
 include ../tools.mk
diff --git a/tests/run-make/alloc-no-rc/Makefile b/tests/run-make/alloc-no-rc/Makefile
index f7422dec3a57d..fcfe1603b6ce9 100644
--- a/tests/run-make/alloc-no-rc/Makefile
+++ b/tests/run-make/alloc-no-rc/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that the Rust compiler can still compile correctly when the unstable no_rc feature is turned on, which disables rc in alloc.
+# This test checks that alloc can still compile correctly when the unstable no_rc feature is turned on.
 # See https://github.com/rust-lang/rust/pull/89891
 
 include ../tools.mk
diff --git a/tests/run-make/alloc-no-sync/Makefile b/tests/run-make/alloc-no-sync/Makefile
index 16db6404fa260..997dbcf66036d 100644
--- a/tests/run-make/alloc-no-sync/Makefile
+++ b/tests/run-make/alloc-no-sync/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that the Rust compiler can still compile correctly when the unstable no_sync feature is turned on, which disables sync in alloc.
+# This test checks that alloc can still compile correctly when the unstable no_sync feature is turned on.
 # See https://github.com/rust-lang/rust/pull/89891
 
 include ../tools.mk
diff --git a/tests/run-make/allocator-shim-circular-deps/Makefile b/tests/run-make/allocator-shim-circular-deps/Makefile
index 04531503eab69..f667e2e2ec293 100644
--- a/tests/run-make/allocator-shim-circular-deps/Makefile
+++ b/tests/run-make/allocator-shim-circular-deps/Makefile
@@ -1,4 +1,6 @@
-# This test intentionally creates a circular dependency, and checks if this causes the resurgence of the compiler bug linked below.
+# This test is designed to intentionally introduce a circular dependency scenario to check that a specific compiler bug doesn't make a resurgence.
+# The bug in question arose when at least one crate required a global allocator, and that crate was placed after the one defining it in the linker order. 
+# The generated symbols.o should not result in any linker errors.
 # See https://github.com/rust-lang/rust/issues/112715
 
 # ignore-cross-compile
diff --git a/tests/run-make/archive-duplicate-names/Makefile b/tests/run-make/archive-duplicate-names/Makefile
index a9a3373ac5616..207eee392993b 100644
--- a/tests/run-make/archive-duplicate-names/Makefile
+++ b/tests/run-make/archive-duplicate-names/Makefile
@@ -1,4 +1,5 @@
-# This test reads two object archives with the same filename, and extracts each one to a unique location. This checks that the functionality of the linked PR is preserved.
+# When two object archives with the same filename are present, an iterator is supposed to inspect each object, recognize the duplication and extract each one to a different directory.
+# This test checks that this duplicate handling behaviour has not been broken.
 # See https://github.com/rust-lang/rust/pull/24439
 
 # ignore-cross-compile
diff --git a/tests/run-make/c-dynamic-dylib/Makefile b/tests/run-make/c-dynamic-dylib/Makefile
index d99634ba09a0d..0d40964048678 100644
--- a/tests/run-make/c-dynamic-dylib/Makefile
+++ b/tests/run-make/c-dynamic-dylib/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that dynamic Rust linking with C does not encounter any errors, with dynamic dependencies given preference over static.
+# This test checks that dynamic Rust linking with C does not encounter any errors, with dynamic dependencies given preference over static.
 # See https://github.com/rust-lang/rust/issues/10434
 
 # ignore-cross-compile
diff --git a/tests/run-make/c-dynamic-rlib/Makefile b/tests/run-make/c-dynamic-rlib/Makefile
index 8e510dc3cdbcd..a64e89cc0dc40 100644
--- a/tests/run-make/c-dynamic-rlib/Makefile
+++ b/tests/run-make/c-dynamic-rlib/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that dynamic Rust linking with C does not encounter any errors, with static dependencies given preference over dynamic. (This is the default behaviour.)
+# This test checks that dynamic Rust linking with C does not encounter any errors, with static dependencies given preference over dynamic. (This is the default behaviour.)
 # See https://github.com/rust-lang/rust/issues/10434
 
 # ignore-cross-compile
diff --git a/tests/run-make/c-link-to-rust-dylib/Makefile b/tests/run-make/c-link-to-rust-dylib/Makefile
index 79b23eb379135..201f717ece49c 100644
--- a/tests/run-make/c-link-to-rust-dylib/Makefile
+++ b/tests/run-make/c-link-to-rust-dylib/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that C linking with Rust does not encounter any errors, with dynamic libraries.
+# This test checks that C linking with Rust does not encounter any errors, with dynamic libraries.
 # See https://github.com/rust-lang/rust/issues/10434
 
 # ignore-cross-compile
diff --git a/tests/run-make/c-link-to-rust-staticlib/Makefile b/tests/run-make/c-link-to-rust-staticlib/Makefile
index 71a632800d08d..d36cc421c468a 100644
--- a/tests/run-make/c-link-to-rust-staticlib/Makefile
+++ b/tests/run-make/c-link-to-rust-staticlib/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that C linking with Rust does not encounter any errors, with static libraries.
+# This test checks that C linking with Rust does not encounter any errors, with static libraries.
 # See https://github.com/rust-lang/rust/issues/10434
 
 # ignore-cross-compile
diff --git a/tests/run-make/c-static-dylib/Makefile b/tests/run-make/c-static-dylib/Makefile
index b808f46521762..05da1743c83ba 100644
--- a/tests/run-make/c-static-dylib/Makefile
+++ b/tests/run-make/c-static-dylib/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that static Rust linking with C does not encounter any errors, with dynamic dependencies given preference over static.
+# This test checks that static Rust linking with C does not encounter any errors, with dynamic dependencies given preference over static.
 # See https://github.com/rust-lang/rust/issues/10434
 
 # ignore-cross-compile
diff --git a/tests/run-make/c-static-rlib/Makefile b/tests/run-make/c-static-rlib/Makefile
index 18a6b2bee071c..298e432cdb8ad 100644
--- a/tests/run-make/c-static-rlib/Makefile
+++ b/tests/run-make/c-static-rlib/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that static Rust linking with C does not encounter any errors, with static dependencies given preference over dynamic. (This is the default behaviour.)
+# This test checks that static Rust linking with C does not encounter any errors, with static dependencies given preference over dynamic. (This is the default behaviour.)
 # See https://github.com/rust-lang/rust/issues/10434
 
 # ignore-cross-compile
diff --git a/tests/run-make/cdylib-dylib-linkage/Makefile b/tests/run-make/cdylib-dylib-linkage/Makefile
index 9038941504bf2..db8393d3c05a7 100644
--- a/tests/run-make/cdylib-dylib-linkage/Makefile
+++ b/tests/run-make/cdylib-dylib-linkage/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that cdylibs can link against dylibs as dependencies, after this restriction was disabled.
+# This test checks that cdylibs can link against dylibs as dependencies, after this restriction was disabled.
 # See https://github.com/rust-lang/rust/commit/72aaa3a414d17aa0c4f19feafa5bab5f84b60e63
 
 # ignore-cross-compile
diff --git a/tests/run-make/cdylib/Makefile b/tests/run-make/cdylib/Makefile
index 47a870ef08718..2c6414c32553c 100644
--- a/tests/run-make/cdylib/Makefile
+++ b/tests/run-make/cdylib/Makefile
@@ -1,4 +1,4 @@
-# When the cdylib crate type was added as a variation of dylib, it needed a test to verify its function.
+# When the cdylib crate type was added as a variation of dylib, it needed a test to check its function.
 # See https://github.com/rust-lang/rust/pull/33553
 
 # ignore-cross-compile
diff --git a/tests/run-make/codegen-options-parsing/Makefile b/tests/run-make/codegen-options-parsing/Makefile
index c4029f29d289e..beaf233502bb7 100644
--- a/tests/run-make/codegen-options-parsing/Makefile
+++ b/tests/run-make/codegen-options-parsing/Makefile
@@ -1,4 +1,4 @@
-# This test intentionally feeds invalid inputs to codegen and checks if the error message outputs contain the expected strings.
+# This test intentionally feeds invalid inputs to codegen and checks if the error message outputs contain specific helpful indications.
 
 # ignore-cross-compile
 include ../tools.mk
diff --git a/tests/run-make/compile-stdin/Makefile b/tests/run-make/compile-stdin/Makefile
index b325b6a6f8783..b3d7cc777a019 100644
--- a/tests/run-make/compile-stdin/Makefile
+++ b/tests/run-make/compile-stdin/Makefile
@@ -1,4 +1,4 @@
-# When provided standard input piped directly into rustc, this test verifies that the compilation completes successfully and that the output can be executed.
+# When provided standard input piped directly into rustc, this test checks that the compilation completes successfully and that the output can be executed.
 # See https://github.com/rust-lang/rust/pull/28805
 
 # ignore-cross-compile
diff --git a/tests/run-make/compiler-lookup-paths-2/Makefile b/tests/run-make/compiler-lookup-paths-2/Makefile
index 1ad0e24b0ebb1..ecc0577384ab6 100644
--- a/tests/run-make/compiler-lookup-paths-2/Makefile
+++ b/tests/run-make/compiler-lookup-paths-2/Makefile
@@ -1,4 +1,4 @@
-# This test verifies that extern crate declarations in Cargo without a corresponding declaration in the manifest of a dependency are NOT allowed.
+# This test checks that extern crate declarations in Cargo without a corresponding declaration in the manifest of a dependency are NOT allowed.
 # See https://github.com/rust-lang/rust/pull/21113
 
 include ../tools.mk

From bdab8b1c0c5a3c4713b634e2400e664e5b8f5bca Mon Sep 17 00:00:00 2001
From: Julien <96022417+Oneirical@users.noreply.github.com>
Date: Thu, 9 May 2024 13:29:46 -0400
Subject: [PATCH 3/3] add FIXME

---
 tests/run-make/cat-and-grep-sanity-check/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-make/cat-and-grep-sanity-check/Makefile b/tests/run-make/cat-and-grep-sanity-check/Makefile
index 327c53548492c..8ee69c0a0de19 100644
--- a/tests/run-make/cat-and-grep-sanity-check/Makefile
+++ b/tests/run-make/cat-and-grep-sanity-check/Makefile
@@ -1,6 +1,6 @@
 # grep in run-make tests was partially replaced with a custom script, CGREP. This tests that CGREP does its job correctly.
 # See https://github.com/rust-lang/rust/commit/ab788a2ee175c7560f0ca58bbc183ecfd57d2f7a
-# Note that this test will likely become useless after the port to rmake.rs tests (see https://github.com/rust-lang/rust/issues/121876)
+# FIXME(Oneirical): Note that this test will likely become useless after the port to rmake.rs tests (see https://github.com/rust-lang/rust/issues/121876)
 
 include ../tools.mk