Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 617b52f

Browse files
committed
Auto merge of rust-lang#126709 - Oneirical:exitestial-crisis, r=<try>
Migrate `include_bytes_deps`, `optimization-remarks-dir-pgo`, `optimization-remarks-dir`, `issue-40535` and `rmeta-preferred` `run-make` tests to rmake Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Needs BSD tryjob. try-job: dist-x86_64-freebsd
2 parents 5c8459f + 61b9273 commit 617b52f

File tree

18 files changed

+107
-70
lines changed

18 files changed

+107
-70
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ run-make/forced-unwind-terminate-pof/Makefile
5757
run-make/foreign-double-unwind/Makefile
5858
run-make/foreign-exceptions/Makefile
5959
run-make/foreign-rust-exceptions/Makefile
60-
run-make/include_bytes_deps/Makefile
6160
run-make/incr-add-rust-src-component/Makefile
6261
run-make/incr-foreign-head-span/Makefile
6362
run-make/inline-always-many-cgu/Makefile
@@ -79,7 +78,6 @@ run-make/issue-33329/Makefile
7978
run-make/issue-35164/Makefile
8079
run-make/issue-36710/Makefile
8180
run-make/issue-37839/Makefile
82-
run-make/issue-40535/Makefile
8381
run-make/issue-47384/Makefile
8482
run-make/issue-47551/Makefile
8583
run-make/issue-68794-textrel-on-minimal-lib/Makefile
@@ -131,8 +129,6 @@ run-make/no-alloc-shim/Makefile
131129
run-make/no-builtins-attribute/Makefile
132130
run-make/no-duplicate-libs/Makefile
133131
run-make/obey-crate-type-flag/Makefile
134-
run-make/optimization-remarks-dir-pgo/Makefile
135-
run-make/optimization-remarks-dir/Makefile
136132
run-make/output-type-permutations/Makefile
137133
run-make/override-aliased-flags/Makefile
138134
run-make/overwrite-input/Makefile
@@ -176,7 +172,6 @@ run-make/rlib-chain/Makefile
176172
run-make/rlib-format-packed-bundled-libs-2/Makefile
177173
run-make/rlib-format-packed-bundled-libs-3/Makefile
178174
run-make/rlib-format-packed-bundled-libs/Makefile
179-
run-make/rmeta-preferred/Makefile
180175
run-make/rustc-macro-dep-files/Makefile
181176
run-make/rustdoc-io-error/Makefile
182177
run-make/sanitizer-cdylib-link/Makefile
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// include_bytes! and include_str! in `main.rs`
2+
// should register the included file as of #24423,
3+
// and this test checks that this is still the case.
4+
// See https://github.com/rust-lang/rust/pull/24423
5+
6+
//FIXME(Oneirical): check if works without ignore freebsd
7+
8+
use run_make_support::{invalid_utf8_contains, rustc};
9+
10+
fn main() {
11+
rustc().emit("dep-info").input("main.rs").run();
12+
invalid_utf8_contains("main.d", "input.txt");
13+
invalid_utf8_contains("main.d", "input.bin");
14+
invalid_utf8_contains("main.d", "input.md");
15+
}

tests/run-make/include_bytes_deps/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/run-make/issue-40535/Makefile

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)