mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Auto merge of #128112 - Oneirical:testidigitation-cantrip, r=jieyouxu
Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `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: i686-msvc // already successful try-job: aarch64-apple try-job: armhf-gnu try-job: test-various try-job: x86_64-msvc try-job: x86_64-gnu-llvm-18
This commit is contained in:
bors
commit
66e5852c3b
@ -41,16 +41,12 @@ run-make/print-calling-conventions/Makefile
|
||||
run-make/print-target-list/Makefile
|
||||
run-make/raw-dylib-alt-calling-convention/Makefile
|
||||
run-make/raw-dylib-c/Makefile
|
||||
run-make/raw-dylib-import-name-type/Makefile
|
||||
run-make/raw-dylib-link-ordinal/Makefile
|
||||
run-make/raw-dylib-stdcall-ordinal/Makefile
|
||||
run-make/redundant-libs/Makefile
|
||||
run-make/remap-path-prefix-dwarf/Makefile
|
||||
run-make/reproducible-build-2/Makefile
|
||||
run-make/reproducible-build/Makefile
|
||||
run-make/rlib-format-packed-bundled-libs-2/Makefile
|
||||
run-make/rlib-format-packed-bundled-libs/Makefile
|
||||
run-make/share-generics-dylib/Makefile
|
||||
run-make/simd-ffi/Makefile
|
||||
run-make/split-debuginfo/Makefile
|
||||
run-make/stable-symbol-names/Makefile
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
# Test the behavior of #[link(.., kind = "raw-dylib")] with alternative calling conventions.
|
||||
|
||||
# only-x86
|
||||
# only-windows
|
||||
|
||||
include ../tools.mk
|
||||
|
||||
all:
|
||||
$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
|
||||
$(call COMPILE_OBJ,"$(TMPDIR)"/extern.obj,extern.c)
|
||||
ifdef IS_MSVC
|
||||
$(CC) "$(TMPDIR)"/extern.obj extern.msvc.def -link -dll -out:"$(TMPDIR)"/extern.dll -noimplib
|
||||
else
|
||||
$(CC) "$(TMPDIR)"/extern.obj extern.gnu.def --no-leading-underscore -shared -o "$(TMPDIR)"/extern.dll
|
||||
endif
|
||||
"$(TMPDIR)"/driver > "$(TMPDIR)"/output.txt
|
||||
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
|
||||
37
tests/run-make/raw-dylib-import-name-type/rmake.rs
Normal file
37
tests/run-make/raw-dylib-import-name-type/rmake.rs
Normal file
@ -0,0 +1,37 @@
|
||||
// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the
|
||||
// attached extern block,
|
||||
// so they may be linked against without linking against an import library.
|
||||
// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md
|
||||
// This test uses this feature alongside `import_name_type`, which allows for customization
|
||||
// of how Windows symbols will be named. A sanity check of this feature is done by comparison
|
||||
// with expected output.
|
||||
// See https://github.com/rust-lang/rust/pull/100732
|
||||
|
||||
//@ only-x86
|
||||
//@ only-windows
|
||||
// Reason: this test specifically exercises a 32bit Windows calling convention.
|
||||
|
||||
use run_make_support::{cc, diff, is_msvc, run, rustc};
|
||||
|
||||
// NOTE: build_native_dynamic lib is not used, as the special `def` files
|
||||
// must be passed to the CC compiler.
|
||||
|
||||
fn main() {
|
||||
rustc().crate_type("bin").input("driver.rs").run();
|
||||
if is_msvc() {
|
||||
cc().arg("-c").out_exe("extern").input("extern.c").run();
|
||||
cc().input("extern.obj")
|
||||
.arg("extern.msvc.def")
|
||||
.args(&["-link", "-dll", "-noimplib", "-out:extern.dll"])
|
||||
.run();
|
||||
} else {
|
||||
cc().arg("-v").arg("-c").out_exe("extern.obj").input("extern.c").run();
|
||||
cc().input("extern.obj")
|
||||
.arg("extern.gnu.def")
|
||||
.args(&["--no-leading-underscore", "-shared"])
|
||||
.output("extern.dll")
|
||||
.run();
|
||||
};
|
||||
let out = run("driver").stdout_utf8();
|
||||
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
# Test the behavior of #[link(.., kind = "raw-dylib")] and #[link_ordinal] on windows-msvc
|
||||
|
||||
# only-windows
|
||||
|
||||
include ../tools.mk
|
||||
|
||||
all:
|
||||
$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
|
||||
$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
|
||||
$(call COMPILE_OBJ,"$(TMPDIR)"/exporter.obj,exporter.c)
|
||||
ifdef IS_MSVC
|
||||
$(CC) "$(TMPDIR)"/exporter.obj exporter.def -link -dll -out:"$(TMPDIR)"/exporter.dll -noimplib
|
||||
else
|
||||
$(CC) "$(TMPDIR)"/exporter.obj exporter.def -shared -o "$(TMPDIR)"/exporter.dll
|
||||
endif
|
||||
"$(TMPDIR)"/driver | tr -d '\r' > "$(TMPDIR)"/output.txt
|
||||
$(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
|
||||
34
tests/run-make/raw-dylib-link-ordinal/rmake.rs
Normal file
34
tests/run-make/raw-dylib-link-ordinal/rmake.rs
Normal file
@ -0,0 +1,34 @@
|
||||
// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the
|
||||
// attached extern block,
|
||||
// so they may be linked against without linking against an import library.
|
||||
// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md
|
||||
// `#[link_ordinal(n)]` allows Rust to link against DLLs that export symbols by ordinal rather
|
||||
// than by name. As long as the ordinal matches, the name of the function in Rust is not
|
||||
// required to match the name of the corresponding function in the exporting DLL.
|
||||
// This test is a sanity check for this feature, done by comparing its output against expected
|
||||
// output.
|
||||
// See https://github.com/rust-lang/rust/pull/89025
|
||||
|
||||
//@ only-windows
|
||||
|
||||
use run_make_support::{cc, diff, is_msvc, run, rustc};
|
||||
|
||||
// NOTE: build_native_dynamic lib is not used, as the special `def` files
|
||||
// must be passed to the CC compiler.
|
||||
|
||||
fn main() {
|
||||
rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run();
|
||||
rustc().crate_type("bin").input("driver.rs").run();
|
||||
if is_msvc() {
|
||||
cc().arg("-c").out_exe("exporter").input("exporter.c").run();
|
||||
cc().input("exporter.obj")
|
||||
.arg("exporter.def")
|
||||
.args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"])
|
||||
.run();
|
||||
} else {
|
||||
cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run();
|
||||
cc().input("exporter.obj").arg("exporter.def").arg("-shared").output("exporter.dll").run();
|
||||
};
|
||||
let out = run("driver").stdout_utf8();
|
||||
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
# Test the behavior of #[link(.., kind = "raw-dylib")], #[link_ordinal], and alternative calling conventions on i686 windows.
|
||||
|
||||
# only-x86
|
||||
# only-windows
|
||||
|
||||
include ../tools.mk
|
||||
|
||||
all:
|
||||
$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
|
||||
$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
|
||||
$(call COMPILE_OBJ,"$(TMPDIR)"/exporter.obj,exporter.c)
|
||||
ifdef IS_MSVC
|
||||
$(CC) "$(TMPDIR)"/exporter.obj exporter-msvc.def -link -dll -out:"$(TMPDIR)"/exporter.dll -noimplib
|
||||
else
|
||||
$(CC) "$(TMPDIR)"/exporter.obj exporter-gnu.def -shared -o "$(TMPDIR)"/exporter.dll
|
||||
endif
|
||||
"$(TMPDIR)"/driver > "$(TMPDIR)"/actual_output.txt
|
||||
$(RUSTC_TEST_OP) "$(TMPDIR)"/actual_output.txt expected_output.txt
|
||||
41
tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs
Normal file
41
tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs
Normal file
@ -0,0 +1,41 @@
|
||||
// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the
|
||||
// attached extern block,
|
||||
// so they may be linked against without linking against an import library.
|
||||
// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md
|
||||
// Almost identical to `raw-dylib-link-ordinal`, but with the addition of calling conventions,
|
||||
// such as stdcall.
|
||||
// See https://github.com/rust-lang/rust/pull/90782
|
||||
|
||||
//@ only-x86
|
||||
//@ only-windows
|
||||
// Reason: this test specifically exercises a 32bit Windows calling convention.
|
||||
|
||||
use run_make_support::{cc, diff, is_msvc, run, rustc};
|
||||
|
||||
// NOTE: build_native_dynamic lib is not used, as the special `def` files
|
||||
// must be passed to the CC compiler.
|
||||
|
||||
fn main() {
|
||||
rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run();
|
||||
rustc().crate_type("bin").input("driver.rs").run();
|
||||
if is_msvc() {
|
||||
cc().arg("-c").out_exe("exporter").input("exporter.c").run();
|
||||
cc().input("exporter.obj")
|
||||
.arg("exporter-msvc.def")
|
||||
.args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"])
|
||||
.run();
|
||||
} else {
|
||||
cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run();
|
||||
cc().input("exporter.obj")
|
||||
.arg("exporter-gnu.def")
|
||||
.arg("-shared")
|
||||
.output("exporter.dll")
|
||||
.run();
|
||||
};
|
||||
let out = run("driver").stdout_utf8();
|
||||
diff()
|
||||
.expected_file("expected_output.txt")
|
||||
.actual_text("actual", out)
|
||||
.normalize(r#"\r"#, "")
|
||||
.run();
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
# ignore-cross-compile
|
||||
# This test makes sure all generic instances get re-exported from Rust dylibs for use by
|
||||
# `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`)
|
||||
# which both provide an instance of `Cell<i32>::set`. There is `instance_user_dylib` which is
|
||||
# supposed to re-export both these instances, and then there are `instance_user_a_rlib` and
|
||||
# `instance_user_b_rlib` which each rely on a specific instance to be available.
|
||||
#
|
||||
# In the end everything is linked together into `linked_leaf`. If `instance_user_dylib` does
|
||||
# not export both then we'll get an `undefined reference` error for one of the instances.
|
||||
#
|
||||
# This is regression test for https://github.com/rust-lang/rust/issues/67276.
|
||||
|
||||
include ../tools.mk
|
||||
|
||||
COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0
|
||||
|
||||
all:
|
||||
$(RUSTC) instance_provider_a.rs $(COMMON_ARGS) --crate-type=rlib
|
||||
$(RUSTC) instance_provider_b.rs $(COMMON_ARGS) --crate-type=rlib
|
||||
$(RUSTC) instance_user_dylib.rs $(COMMON_ARGS) --crate-type=dylib
|
||||
$(RUSTC) instance_user_a_rlib.rs $(COMMON_ARGS) --crate-type=rlib
|
||||
$(RUSTC) instance_user_b_rlib.rs $(COMMON_ARGS) --crate-type=rlib
|
||||
$(RUSTC) linked_leaf.rs $(COMMON_ARGS) --crate-type=bin
|
||||
30
tests/run-make/share-generics-dylib/rmake.rs
Normal file
30
tests/run-make/share-generics-dylib/rmake.rs
Normal file
@ -0,0 +1,30 @@
|
||||
// This test makes sure all generic instances get re-exported from Rust dylibs for use by
|
||||
// `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`)
|
||||
// which both provide an instance of `Cell<i32>::set`. There is `instance_user_dylib` which is
|
||||
// supposed to re-export both these instances, and then there are `instance_user_a_rlib` and
|
||||
// `instance_user_b_rlib` which each rely on a specific instance to be available.
|
||||
//
|
||||
// In the end everything is linked together into `linked_leaf`. If `instance_user_dylib` does
|
||||
// not export both then we'll get an `undefined reference` error for one of the instances.
|
||||
//
|
||||
// This is regression test for https://github.com/rust-lang/rust/issues/67276.
|
||||
|
||||
use run_make_support::rustc;
|
||||
|
||||
fn main() {
|
||||
compile("rlib", "instance_provider_a.rs");
|
||||
compile("rlib", "instance_provider_b.rs");
|
||||
compile("dylib", "instance_user_dylib.rs");
|
||||
compile("rlib", "instance_user_a_rlib.rs");
|
||||
compile("rlib", "instance_user_b_rlib.rs");
|
||||
compile("bin", "linked_leaf.rs");
|
||||
}
|
||||
|
||||
fn compile(crate_type: &str, input: &str) {
|
||||
rustc()
|
||||
.input(input)
|
||||
.crate_type(crate_type)
|
||||
.args(&["-Cprefer-dynamic", "-Zshare-generics=yes", "-Csymbol-mangling-version=v0"])
|
||||
.codegen_units(1)
|
||||
.run();
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user