From 40cad01f2f9d830aeb798057a0aeb761316ebf28 Mon Sep 17 00:00:00 2001 From: Oneirical Date: Wed, 19 Jun 2024 13:25:29 -0400 Subject: [PATCH] rewrite and rename include_bytes_deps to rmake --- src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 - .../input.bin | 0 .../input.md | 0 .../input.txt | 0 .../main.rs | 0 tests/run-make/include-bytes-deps/rmake.rs | 15 +++++++++++++++ tests/run-make/include_bytes_deps/Makefile | 7 ------- 7 files changed, 15 insertions(+), 8 deletions(-) rename tests/run-make/{include_bytes_deps => include-bytes-deps}/input.bin (100%) rename tests/run-make/{include_bytes_deps => include-bytes-deps}/input.md (100%) rename tests/run-make/{include_bytes_deps => include-bytes-deps}/input.txt (100%) rename tests/run-make/{include_bytes_deps => include-bytes-deps}/main.rs (100%) create mode 100644 tests/run-make/include-bytes-deps/rmake.rs delete mode 100644 tests/run-make/include_bytes_deps/Makefile diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 2da4e476e90..6d135598186 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -46,7 +46,6 @@ run-make/fmt-write-bloat/Makefile run-make/foreign-double-unwind/Makefile run-make/foreign-exceptions/Makefile run-make/foreign-rust-exceptions/Makefile -run-make/include_bytes_deps/Makefile run-make/incr-add-rust-src-component/Makefile run-make/incr-foreign-head-span/Makefile run-make/interdependent-c-libraries/Makefile diff --git a/tests/run-make/include_bytes_deps/input.bin b/tests/run-make/include-bytes-deps/input.bin similarity index 100% rename from tests/run-make/include_bytes_deps/input.bin rename to tests/run-make/include-bytes-deps/input.bin diff --git a/tests/run-make/include_bytes_deps/input.md b/tests/run-make/include-bytes-deps/input.md similarity index 100% rename from tests/run-make/include_bytes_deps/input.md rename to tests/run-make/include-bytes-deps/input.md diff --git a/tests/run-make/include_bytes_deps/input.txt b/tests/run-make/include-bytes-deps/input.txt similarity index 100% rename from tests/run-make/include_bytes_deps/input.txt rename to tests/run-make/include-bytes-deps/input.txt diff --git a/tests/run-make/include_bytes_deps/main.rs b/tests/run-make/include-bytes-deps/main.rs similarity index 100% rename from tests/run-make/include_bytes_deps/main.rs rename to tests/run-make/include-bytes-deps/main.rs diff --git a/tests/run-make/include-bytes-deps/rmake.rs b/tests/run-make/include-bytes-deps/rmake.rs new file mode 100644 index 00000000000..6ca29fa664c --- /dev/null +++ b/tests/run-make/include-bytes-deps/rmake.rs @@ -0,0 +1,15 @@ +// include_bytes! and include_str! in `main.rs` +// should register the included file as of #24423, +// and this test checks that this is still the case. +// See https://github.com/rust-lang/rust/pull/24423 + +//FIXME(Oneirical): check if works without ignore freebsd + +use run_make_support::{invalid_utf8_contains, rustc}; + +fn main() { + rustc().emit("dep-info").input("main.rs").run(); + invalid_utf8_contains("main.d", "input.txt"); + invalid_utf8_contains("main.d", "input.bin"); + invalid_utf8_contains("main.d", "input.md"); +} diff --git a/tests/run-make/include_bytes_deps/Makefile b/tests/run-make/include_bytes_deps/Makefile deleted file mode 100644 index 696dfd207bb..00000000000 --- a/tests/run-make/include_bytes_deps/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include ../tools.mk - -# ignore-freebsd - -all: - $(RUSTC) --emit dep-info main.rs - $(CGREP) "input.txt" "input.bin" "input.md" < $(TMPDIR)/main.d