Skip to content

Commit

Permalink
rewrite forced-unwind-terminate-pof to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jun 19, 2024
1 parent d1e8c6b commit e7ea063
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 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
Expand Up @@ -51,7 +51,6 @@ run-make/extern-multiple-copies/Makefile
run-make/extern-multiple-copies2/Makefile
run-make/extra-filename-with-temp-outputs/Makefile
run-make/fmt-write-bloat/Makefile
run-make/forced-unwind-terminate-pof/Makefile
run-make/foreign-double-unwind/Makefile
run-make/foreign-exceptions/Makefile
run-make/foreign-rust-exceptions/Makefile
Expand Down
9 changes: 0 additions & 9 deletions tests/run-make/forced-unwind-terminate-pof/Makefile

This file was deleted.

16 changes: 16 additions & 0 deletions tests/run-make/forced-unwind-terminate-pof/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// During a forced unwind, crossing the non-Plain Old Frame
// would define the forced unwind as undefined behaviour, and
// immediately abort the unwinding process. This test checks
// that the forced unwinding takes precedence.
// See https://github.com/rust-lang/rust/issues/101469

//@ ignore-cross-compile
//@ ignore-windows
//Reason: pthread (POSIX threads) is not available on Windows

use run_make_support::{run, rustc};

fn main() {
rustc().input("foo.rs").run();
run("foo").assert_stdout_not_contains("cannot unwind");
}
1 change: 0 additions & 1 deletion tests/run-make/metadata-flag-frobs-symbols/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ fn main() {
.input("bar.rs")
.extern_("foo1", rust_lib_name("foo-a"))
.extern_("foo2", rust_lib_name("foo-b"))
.print("link-args")
.run();
run("bar");
}

0 comments on commit e7ea063

Please sign in to comment.