Skip to content

Commit 86ad438

Browse files
authored
Unrolled build for rust-lang#125213
Rollup merge of rust-lang#125213 - Oneirical:easy-test, r=jieyouxu Migrate `run-make/static-unwinding` 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). An easy one after the last one, though the explanatory comment could use some clarification.
2 parents 9b75a43 + 760b505 commit 86ad438

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ run-make/stable-symbol-names/Makefile
263263
run-make/static-dylib-by-default/Makefile
264264
run-make/static-extern-type/Makefile
265265
run-make/static-pie/Makefile
266-
run-make/static-unwinding/Makefile
267266
run-make/staticlib-blank-lib/Makefile
268267
run-make/staticlib-dylib-linkage/Makefile
269268
run-make/std-core-cycle/Makefile

tests/run-make/static-unwinding/Makefile

-8
This file was deleted.
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// During unwinding, an implementation of Drop is possible to clean up resources.
2+
// This test implements drop in both a main function and its static library.
3+
// If the test succeeds, a Rust program being a static library does not affect Drop implementations.
4+
// See https://github.com/rust-lang/rust/issues/10434
5+
6+
//@ ignore-cross-compile
7+
//@ needs-unwind
8+
9+
use run_make_support::{run, rustc};
10+
11+
fn main() {
12+
rustc().input("lib.rs").run();
13+
rustc().input("main.rs").run();
14+
run("main");
15+
}

0 commit comments

Comments
 (0)