-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #128112 - Oneirical:testidigitation-cantrip, r=<try>
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: x86_64-msvc try-job: x86_64-mingw try-job: armhf-gnu try-job: test-various
- Loading branch information
Showing
10 changed files
with
142 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// `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_64 | ||
//@ 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("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).run(); | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// `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_64 | ||
//@ 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-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(); | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
} |
4 changes: 2 additions & 2 deletions
4
tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
//@ only-windows | ||
//@ only-x86 | ||
//@ only-x86_64 | ||
#[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")] | ||
//~^ ERROR unknown import name type `unknown`, expected one of: decorated, noprefix, undecorated | ||
extern "C" { } | ||
extern "C" {} | ||
|
||
fn main() {} |