Skip to content

Commit e088edd

Browse files
committed
rewrite output-filename-conflicts-with-directory to rmake
1 parent e9ff47f commit e088edd

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ run-make/no-duplicate-libs/Makefile
152152
run-make/obey-crate-type-flag/Makefile
153153
run-make/optimization-remarks-dir-pgo/Makefile
154154
run-make/optimization-remarks-dir/Makefile
155-
run-make/output-filename-conflicts-with-directory/Makefile
156155
run-make/output-filename-overwrites-input/Makefile
157156
run-make/output-type-permutations/Makefile
158157
run-make/output-with-hyphens/Makefile

tests/run-make/output-filename-conflicts-with-directory/Makefile

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// When the compiled executable would conflict with a directory, a
2+
// rustc error should be displayed instead of a verbose and
3+
// potentially-confusing linker error.
4+
// See https://github.com/rust-lang/rust/pull/47203
5+
6+
use run_make_support::{fs_wrapper, rustc};
7+
8+
fn main() {
9+
fs_wrapper::create_dir("foo");
10+
rustc().input("foo.rs").output("foo").run_fail().assert_stderr_contains(r#"the generated executable for the input file "foo.rs" conflicts with the existing directory "foo""#);
11+
}

0 commit comments

Comments
 (0)