Rewrite and rename issue-26092 to rmake

rust-lang · May 24, 2024 · 70a3ac6 · 70a3ac6
1 parent 40e35d6
commit 70a3ac6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -99,7 +99,6 @@ run-make/issue-20626/Makefile
 run-make/issue-22131/Makefile
 run-make/issue-25581/Makefile
 run-make/issue-26006/Makefile
-run-make/issue-26092/Makefile
 run-make/issue-28595/Makefile
 run-make/issue-33329/Makefile
 run-make/issue-35164/Makefile

diff --git a/tests/run-make/issue-26092/Makefile b/tests/run-make/issue-26092/Makefile
diff --git a/tests/run-make/link-dedup/Makefile b/tests/run-make/link-dedup/Makefile
diff --git a/tests/run-make/issue-26092/blank.rs → ...s/run-make/no-panic-blank-output/blank.rs b/tests/run-make/issue-26092/blank.rs → ...s/run-make/no-panic-blank-output/blank.rs
diff --git a/tests/run-make/no-panic-blank-output/rmake.rs b/tests/run-make/no-panic-blank-output/rmake.rs
@@ -0,0 +1,13 @@
+// When an empty output file is passed to rustc, the ensuing error message
+// should be clear. However, calling file_stem on an empty path returns None,
+// which, when unwrapped, causes a panic, stopping execution of rustc
+// and printing an obscure message instead of reaching the helpful
+// error message. This test checks that the panic does not occur.
+// See https://github.com/rust-lang/rust/pull/26199
+
+fn main() {
+    let output = String::from_utf8(rustc().output("").input("blank.rs").command_output().stderr)
+        .unwrap()
+        .to_lowercase();
+    assert!(!output.contains("panic"));
+}