Skip to content

Commit

Permalink
rewrite allocator-shim-circular-deps to ui test
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jun 18, 2024
1 parent dfba1b5 commit 78998f3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
run-make/allocator-shim-circular-deps/Makefile
run-make/archive-duplicate-names/Makefile
run-make/atomic-lock-free/Makefile
run-make/branch-protection-check-IBT/Makefile
Expand Down
12 changes: 0 additions & 12 deletions tests/run-make/allocator-shim-circular-deps/Makefile

This file was deleted.

16 changes: 16 additions & 0 deletions tests/run-make/allocator-shim-circular-deps/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// 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

use run_make_support::{rust_lib_name, rustc};

fn main() {
rustc().input("my_lib.rs").run();
rustc().input("main.rs").arg("--test").extern_("my_lib", rust_lib_name("my_lib")).run();
}
2 changes: 1 addition & 1 deletion tests/run-make/separate-link/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// The compiler flags no-link (and by extension, link-only) used to be broken
// due to changes in encoding/decoding. This was patched, and this test ensures
// due to changes in encoding/decoding. This was patched, and this test checks
// that these flags are not broken again, resulting in successful compilation.
// See https://github.com/rust-lang/rust/issues/77857

Expand Down

0 comments on commit 78998f3

Please sign in to comment.