-
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 #128107 - Oneirical:tomato-hartester, r=<try>
Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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
- Loading branch information
Showing
9 changed files
with
121 additions
and
82 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 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 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,28 @@ | ||
// `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 alternative calling conventions, checking that both | ||
// features are compatible and result in the expected output upon execution of the binary. | ||
// See https://github.com/rust-lang/rust/pull/84171 | ||
|
||
//@ only-x86 | ||
//@ only-windows | ||
|
||
use run_make_support::{build_native_dynamic_lib, diff, is_msvc, run, run_with_args, rustc}; | ||
|
||
fn main() { | ||
rustc() | ||
.crate_type("lib") | ||
.crate_name("raw_dylib_alt_calling_convention_test") | ||
.input("lib.rs") | ||
.run(); | ||
rustc().crate_type("bin").input("driver.rs").run(); | ||
build_native_dynamic_lib("extern"); | ||
let out = run("driver").stdout_utf8(); | ||
diff().expected_file("output.txt").actual_text("actual", out).run(); | ||
if is_msvc() { | ||
let out_msvc = run_with_args("driver", &["true"]).stdout_utf8(); | ||
diff().expected_file("output.msvc.txt").actual_text("actual", out_msvc).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,29 @@ | ||
// `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 is the simplest of the raw-dylib tests, simply smoke-testing that the feature | ||
// can be used to build an executable binary with an expected output with native C files | ||
// compiling into dynamic libraries. | ||
// See https://github.com/rust-lang/rust/pull/86419 | ||
|
||
//@ only-windows | ||
|
||
use run_make_support::{build_native_dynamic_lib, diff, run, rustc}; | ||
|
||
fn main() { | ||
rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run(); | ||
rustc().crate_type("bin").input("driver.rs").run(); | ||
rustc().crate_type("bin").crate_name("raw_dylib_test_bin").input("lib.rs").run(); | ||
build_native_dynamic_lib("extern_1"); | ||
build_native_dynamic_lib("extern_2"); | ||
let out_driver = run("driver").stdout_utf8(); | ||
let out_raw = run("raw_dylib_test_bin").stdout_utf8(); | ||
|
||
diff() | ||
.expected_file("output.txt") | ||
.actual_text("actual", out_driver) | ||
.normalize(r#"\r"#, "") | ||
.run(); | ||
diff().expected_file("output.txt").actual_text("actual", out_raw).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,28 @@ | ||
// rustc will remove one of the two redundant references to foo below. Depending | ||
// on which one gets removed, we'll get a linker error on SOME platforms (like | ||
// Linux). On these platforms, when a library is referenced, the linker will | ||
// only pull in the symbols needed _at that point in time_. If a later library | ||
// depends on additional symbols from the library, they will not have been pulled | ||
// in, and you'll get undefined symbols errors. | ||
// | ||
// So in this example, we need to ensure that rustc keeps the _later_ reference | ||
// to foo, and not the former one. | ||
|
||
//@ ignore-cross-compile | ||
// Reason: the compiled binary is executed | ||
|
||
//FIXME(Oneirical): msvc | ||
|
||
use run_make_support::{build_native_dynamic_lib, build_native_static_lib, run, rustc}; | ||
|
||
fn main() { | ||
build_native_dynamic_lib("foo"); | ||
build_native_static_lib("bar"); | ||
build_native_static_lib("baz"); | ||
rustc() | ||
.input("main.rs") | ||
.args(&["-lstatic=bar", "-lfoo", "-lstatic=baz", "-lfoo"]) | ||
.print("link-args") | ||
.run(); | ||
run("main"); | ||
} |