Auto merge of #128065 - Oneirical:great-testilence, r=jieyouxu
Migrate `c-unwind-abi-catch-lib-panic`, `foreign-rust-exceptions` and `export-executable-symbols` `run-make` tests to rmake Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: try-job: aarch64-apple try-job: i686-mingw
This commit is contained in:
commit
47243b335e
7 changed files with 84 additions and 62 deletions
|
|
@ -1,5 +1,4 @@
|
|||
run-make/branch-protection-check-IBT/Makefile
|
||||
run-make/c-unwind-abi-catch-lib-panic/Makefile
|
||||
run-make/cat-and-grep-sanity-check/Makefile
|
||||
run-make/cdylib-dylib-linkage/Makefile
|
||||
run-make/cross-lang-lto-clang/Makefile
|
||||
|
|
@ -10,12 +9,10 @@ run-make/dep-info-doesnt-run-much/Makefile
|
|||
run-make/dep-info-spaces/Makefile
|
||||
run-make/dep-info/Makefile
|
||||
run-make/emit-to-stdout/Makefile
|
||||
run-make/export-executable-symbols/Makefile
|
||||
run-make/extern-fn-reachable/Makefile
|
||||
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/incr-add-rust-src-component/Makefile
|
||||
run-make/issue-35164/Makefile
|
||||
run-make/issue-36710/Makefile
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
# Exercise unwinding a panic. This catches a panic across an FFI boundary and downcasts it into an integer. The Rust code that panics is in a separate crate.
|
||||
# See https://github.com/rust-lang/rust/commit/baf227ea0c1e07fc54395a51e4b3881d701180cb
|
||||
|
||||
# ignore-cross-compile
|
||||
# needs-unwind
|
||||
include ../tools.mk
|
||||
|
||||
all: archive
|
||||
# Compile `main.rs`, which will link into our library, and run it.
|
||||
$(RUSTC) main.rs
|
||||
$(call RUN,main)
|
||||
|
||||
ifdef IS_MSVC
|
||||
archive: add.o panic.o
|
||||
# Now, create an archive using these two objects.
|
||||
$(AR) crus $(TMPDIR)/add.lib $(TMPDIR)/add.o $(TMPDIR)/panic.o
|
||||
else
|
||||
archive: add.o panic.o
|
||||
# Now, create an archive using these two objects.
|
||||
$(AR) crus $(TMPDIR)/libadd.a $(TMPDIR)/add.o $(TMPDIR)/panic.o
|
||||
endif
|
||||
|
||||
# Compile `panic.rs` into an object file.
|
||||
#
|
||||
# Note that we invoke `rustc` directly, so we may emit an object rather
|
||||
# than an archive. We'll do that later.
|
||||
panic.o:
|
||||
$(BARE_RUSTC) $(RUSTFLAGS) \
|
||||
--out-dir $(TMPDIR) \
|
||||
--emit=obj panic.rs
|
||||
|
||||
# Compile `add.c` into an object file.
|
||||
add.o:
|
||||
$(call COMPILE_OBJ,$(TMPDIR)/add.o,add.c)
|
||||
|
||||
36
tests/run-make/c-unwind-abi-catch-lib-panic/rmake.rs
Normal file
36
tests/run-make/c-unwind-abi-catch-lib-panic/rmake.rs
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
// Exercise unwinding a panic. This catches a panic across an FFI (foreign function interface)
|
||||
// boundary and downcasts it into an integer.
|
||||
// The Rust code that panics is in a separate crate.
|
||||
// See https://github.com/rust-lang/rust/commit/baf227ea0c1e07fc54395a51e4b3881d701180cb
|
||||
|
||||
//@ ignore-cross-compile
|
||||
// Reason: the compiled binary is executed
|
||||
//@ needs-unwind
|
||||
// Reason: this test exercises unwinding a panic
|
||||
|
||||
use run_make_support::{cc, is_msvc, llvm_ar, run, rustc, static_lib_name};
|
||||
|
||||
fn main() {
|
||||
// Compile `add.c` into an object file.
|
||||
if is_msvc() {
|
||||
cc().arg("-c").out_exe("add").input("add.c").run();
|
||||
} else {
|
||||
cc().arg("-v").arg("-c").out_exe("add.o").input("add.c").run();
|
||||
};
|
||||
|
||||
// Compile `panic.rs` into an object file.
|
||||
// Note that we invoke `rustc` directly, so we may emit an object rather
|
||||
// than an archive. We'll do that later.
|
||||
rustc().emit("obj").input("panic.rs").run();
|
||||
|
||||
// Now, create an archive using these two objects.
|
||||
if is_msvc() {
|
||||
llvm_ar().obj_to_ar().args(&[&static_lib_name("add"), "add.obj", "panic.o"]).run();
|
||||
} else {
|
||||
llvm_ar().obj_to_ar().args(&[&static_lib_name("add"), "add.o", "panic.o"]).run();
|
||||
};
|
||||
|
||||
// Compile `main.rs`, which will link into our library, and run it.
|
||||
rustc().input("main.rs").run();
|
||||
run("main");
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
include ../tools.mk
|
||||
|
||||
# ignore-wasm32
|
||||
# ignore-wasm64
|
||||
# ignore-none no-std is not supported
|
||||
# only-linux
|
||||
|
||||
all:
|
||||
$(RUSTC) -Zexport-executable-symbols main.rs --target $(TARGET) --crate-type=bin
|
||||
nm $(TMPDIR)/main | $(CGREP) exported_symbol
|
||||
|
||||
25
tests/run-make/export-executable-symbols/rmake.rs
Normal file
25
tests/run-make/export-executable-symbols/rmake.rs
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
// The unstable flag `-Z export-executable-symbols` exports symbols from executables, as if
|
||||
// they were dynamic libraries. This test is a simple smoke test to check that this feature
|
||||
// works by using it in compilation, then checking that the output binary contains the exported
|
||||
// symbol.
|
||||
// See https://github.com/rust-lang/rust/pull/85673
|
||||
|
||||
//@ only-unix
|
||||
// Reason: the export-executable-symbols flag only works on Unix
|
||||
// due to hardcoded platform-specific implementation
|
||||
// (See #85673)
|
||||
//@ ignore-wasm32
|
||||
//@ ignore-wasm64
|
||||
//@ ignore-none
|
||||
// Reason: no-std is not supported
|
||||
|
||||
use run_make_support::{bin_name, llvm_readobj, rustc};
|
||||
|
||||
fn main() {
|
||||
rustc().arg("-Zexport-executable-symbols").input("main.rs").crate_type("bin").run();
|
||||
llvm_readobj()
|
||||
.symbols()
|
||||
.input(bin_name("main"))
|
||||
.run()
|
||||
.assert_stdout_contains("exported_symbol");
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
# ignore-cross-compile
|
||||
# ignore-i686-pc-windows-gnu
|
||||
# needs-unwind
|
||||
|
||||
# This test doesn't work on 32-bit MinGW as cdylib has its own copy of unwinder
|
||||
# so cross-DLL unwinding does not work.
|
||||
|
||||
include ../tools.mk
|
||||
|
||||
all:
|
||||
$(RUSTC) bar.rs --crate-type=cdylib
|
||||
$(RUSTC) foo.rs
|
||||
$(call RUN,foo) 2>&1 | $(CGREP) "Rust cannot catch foreign exceptions"
|
||||
23
tests/run-make/foreign-rust-exceptions/rmake.rs
Normal file
23
tests/run-make/foreign-rust-exceptions/rmake.rs
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
// Rust exceptions can be foreign (from C code, in this test) or local. Foreign
|
||||
// exceptions should not be caught, as that can cause undefined behaviour. Instead
|
||||
// of catching them, #102721 made it so that the binary panics in execution with a helpful message.
|
||||
// This test checks that the correct message appears and that execution fails when trying to catch
|
||||
// a foreign exception.
|
||||
// See https://github.com/rust-lang/rust/issues/102715
|
||||
|
||||
//@ ignore-cross-compile
|
||||
// Reason: the compiled binary is executed
|
||||
//@ needs-unwind
|
||||
// Reason: unwinding panics is exercised in this test
|
||||
|
||||
//@ ignore-i686-pc-windows-gnu
|
||||
// Reason: This test doesn't work on 32-bit MinGW as cdylib has its own copy of unwinder
|
||||
// so cross-DLL unwinding does not work.
|
||||
|
||||
use run_make_support::{run_fail, rustc};
|
||||
|
||||
fn main() {
|
||||
rustc().input("bar.rs").crate_type("cdylib").run();
|
||||
rustc().input("foo.rs").run();
|
||||
run_fail("foo").assert_stderr_contains("Rust cannot catch foreign exceptions");
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue