-
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 #128079 - Oneirical:testiges-of-civilization, r=<try>
Migrate `static-dylib-by-default`, `sanitizer-dylib-link`, `sanitizer-cdylib-link` and `sanitizer-staticlib-link` `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: armhf-gnu try-job: test-various try-job: i686-msvc try-job: x86_64-mingw try-job: x86_64-gnu-llvm-18
- Loading branch information
Showing
9 changed files
with
94 additions
and
73 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,17 @@ | ||
// Identical to sanitizer-dylib-link, but with a cdylib. | ||
// This test builds a shared object, then an executable that links it as a native | ||
// rust library (contrast to an rlib). The shared library and executable both | ||
// are compiled with address sanitizer, and we assert that a fault in the cdylib | ||
// is correctly detected. | ||
// See https://github.com/rust-lang/rust/pull/38699 | ||
|
||
//@ needs-sanitizer-support | ||
//@ needs-sanitizer-address | ||
|
||
use run_make_support::{run_fail, rustc}; | ||
|
||
fn main() { | ||
rustc().arg("-g").arg("-Zsanitizer=address").crate_type("cdylib").input("library.rs").run(); | ||
rustc().arg("-g").arg("-Zsanitizer=address").crate_type("bin").input("program.rs").run(); | ||
run_fail("program").assert_stderr_contains("stack-buffer-overflow"); | ||
} |
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,16 @@ | ||
// This test builds a shared object, then an executable that links it as a native | ||
// rust library (contrast to an rlib). The shared library and executable both | ||
// are compiled with address sanitizer, and we assert that a fault in the dylib | ||
// is correctly detected. | ||
// See https://github.com/rust-lang/rust/pull/38699 | ||
|
||
//@ needs-sanitizer-support | ||
//@ needs-sanitizer-address | ||
|
||
use run_make_support::{run_fail, rustc}; | ||
|
||
fn main() { | ||
rustc().arg("-g").arg("-Zsanitizer=address").crate_type("dylib").input("library.rs").run(); | ||
rustc().arg("-g").arg("-Zsanitizer=address").crate_type("bin").input("program.rs").run(); | ||
run_fail("program").assert_stderr_contains("stack-buffer-overflow"); | ||
} |
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,26 @@ | ||
// This test first builds a staticlib with AddressSanitizer and checks that | ||
// linking it to an executable fails due to the missing sanitizer runtime. | ||
// It then builds an executable linking to the staticlib and checks that | ||
// the fault in the staticlib is detected correctly. | ||
|
||
// Note that checking for the link failure actually checks two things at once: | ||
// 1) That the library has the sanitizer intrumentation | ||
// 2) and that library does not have the sanitizer runtime | ||
// See https://github.com/rust-lang/rust/pull/38699 | ||
|
||
//@ needs-sanitizer-support | ||
//@ needs-sanitizer-address | ||
|
||
use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run_fail, rustc, static_lib_name}; | ||
|
||
fn main() { | ||
rustc().arg("-g").arg("-Zsanitizer=address").crate_type("staticlib").input("library.rs").run(); | ||
cc().input("program.c") | ||
.arg(static_lib_name("library")) | ||
.out_exe("program") | ||
.args(extra_c_flags()) | ||
.args(extra_cxx_flags()) | ||
.run_fail(); | ||
rustc().arg("-g").arg("-Zsanitizer=address").crate_type("bin").input("program.rs").run(); | ||
run_fail("program").assert_stderr_contains("stack-buffer-overflow"); | ||
} |
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,35 @@ | ||
// If a dylib is being produced, the compiler will first check to see if it can | ||
// be created entirely statically before falling back to dynamic dependencies. This | ||
// behavior can be overridden with `-C prefer-dynamic`. | ||
// In this test, bar depends on foo and is compiled fully statically despite the available | ||
// `foo` dynamic library. This allows the main binary to be executed in the final step. | ||
// See https://github.com/rust-lang/rust/commit/3036b001276a6e43409b08b7f2334ce72aeeb036 | ||
|
||
//@ ignore-cross-compile | ||
// Reason: the compiled binary is executed | ||
|
||
use run_make_support::{ | ||
cc, cwd, dynamic_lib_name, extra_c_flags, has_extension, is_msvc, rfs, run, rustc, | ||
shallow_find_files, | ||
}; | ||
|
||
fn main() { | ||
rustc().input("foo.rs").run(); | ||
rustc().input("bar.rs").run(); | ||
// On msvc, dynamic libraries are compiled by rustc to: | ||
// bar.dll // dylib | ||
// bar.dll.lib // import library for the dylib | ||
// bar.dll.exp // export library for the dylib | ||
// msvc's underlying link.exe requires the import library for the dynamic library as input. | ||
// That is why the library is bar.dll.lib, not bar.dll. | ||
let library = if is_msvc() { "bar.dll.lib" } else { &dynamic_lib_name("bar") }; | ||
cc().input("main.c").out_exe("main").arg(library).args(extra_c_flags()).run(); | ||
for rlib in shallow_find_files(cwd(), |path| has_extension(path, "rlib")) { | ||
rfs::remove_file(rlib); | ||
} | ||
rfs::remove_file(dynamic_lib_name("foo")); | ||
if is_msvc() { | ||
rfs::remove_file("foo.dll.lib"); | ||
} | ||
run("main"); | ||
} |