-
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 #125500 - Oneirical:bundle-them-up-why-not, r=jieyouxu
Migrate `link-arg`, `link-dedup` and `issue-26092` `run-make` tests to `rmake` format Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). All of these tests check if rustc's output contains (or does not) contain certain strings. Does that mean these could be better suited to becoming UI/codegen tests? try-job: x86_64-msvc
- Loading branch information
Showing
11 changed files
with
107 additions
and
42 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 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
File renamed without changes.
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,13 @@ | ||
// When an empty output file is passed to rustc, the ensuing error message | ||
// should be clear. However, calling file_stem on an empty path returns None, | ||
// which, when unwrapped, causes a panic, stopping execution of rustc | ||
// and printing an obscure message instead of reaching the helpful | ||
// error message. This test checks that the panic does not occur. | ||
// See https://github.com/rust-lang/rust/pull/26199 | ||
|
||
use run_make_support::rustc; | ||
|
||
fn main() { | ||
let output = rustc().output("").stdin(b"fn main() {}").run_fail(); | ||
output.assert_stderr_not_contains("panic"); | ||
} |
This file was deleted.
Oops, something went wrong.
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,20 @@ | ||
// In 2016, the rustc flag "-C link-arg" was introduced - it can be repeatedly used | ||
// to add single arguments to the linker. This test passes 2 arguments to the linker using it, | ||
// then checks that the compiler's output contains the arguments passed to it. | ||
// This ensures that the compiler successfully parses this flag. | ||
// See https://github.com/rust-lang/rust/pull/36574 | ||
|
||
use run_make_support::rustc; | ||
|
||
fn main() { | ||
// We are only checking for the output of --print=link-args, | ||
// rustc failing or succeeding does not matter. | ||
let out = rustc() | ||
.input("empty.rs") | ||
.link_arg("-lfoo") | ||
.link_arg("-lbar") | ||
.print("link-args") | ||
.run_unchecked(); | ||
out.assert_stdout_contains("lfoo"); | ||
out.assert_stdout_contains("lbar"); | ||
} |
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,24 @@ | ||
// When native libraries are passed to the linker, there used to be an annoyance | ||
// where multiple instances of the same library in a row would cause duplication in | ||
// outputs. This has been fixed, and this test checks that it stays fixed. | ||
// With the --cfg flag, -ltestb gets added to the output, breaking up the chain of -ltesta. | ||
// Without the --cfg flag, there should be a single -ltesta, no more, no less. | ||
// See https://github.com/rust-lang/rust/pull/84794 | ||
|
||
//@ ignore-msvc | ||
|
||
use run_make_support::rustc; | ||
|
||
fn main() { | ||
rustc().input("depa.rs").run(); | ||
rustc().input("depb.rs").run(); | ||
rustc().input("depc.rs").run(); | ||
let output = rustc().input("empty.rs").cfg("bar").run_fail(); | ||
output.assert_stderr_contains(r#""-ltesta" "-ltestb" "-ltesta""#); | ||
let output = rustc().input("empty.rs").run_fail(); | ||
output.assert_stderr_contains(r#""-ltesta""#); | ||
let output = rustc().input("empty.rs").run_fail(); | ||
output.assert_stderr_not_contains(r#""-ltestb""#); | ||
let output = rustc().input("empty.rs").run_fail(); | ||
output.assert_stderr_not_contains(r#""-ltesta" "-ltesta" "-ltesta""#); | ||
} |