-
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.
Rollup merge of #127822 - Oneirical:amazon-rainfortest, r=jieyouxu
Migrate `issue-85401-static-mir`, `missing-crate-dependency` and `unstable-flag-required` `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). try-job: armhf-gnu try-job: test-various try-job: x86_64-msvc try-job: aarch64-apple try-job: dist-x86_64-linux
- Loading branch information
Showing
10 changed files
with
71 additions
and
32 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
File renamed without changes.
File renamed without changes.
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,42 @@ | ||
// Trying to access mid-level internal representation (MIR) in statics | ||
// used to cause an internal compiler error (ICE), now handled as a proper | ||
// error since #100211. This test checks that the correct error is printed | ||
// during the linking process, and not the ICE. | ||
// See https://github.com/rust-lang/rust/issues/85401 | ||
|
||
use run_make_support::{bin_name, rust_lib_name, rustc}; | ||
|
||
fn main() { | ||
rustc() | ||
.crate_type("rlib") | ||
.crate_name("foo") | ||
.arg("-Crelocation-model=pic") | ||
.edition("2018") | ||
.input("foo.rs") | ||
.arg("-Zalways-encode-mir=yes") | ||
.emit("metadata") | ||
.output("libfoo.rmeta") | ||
.run(); | ||
rustc() | ||
.crate_type("rlib") | ||
.crate_name("bar") | ||
.arg("-Crelocation-model=pic") | ||
.edition("2018") | ||
.input("bar.rs") | ||
.output(rust_lib_name("bar")) | ||
.extern_("foo", "libfoo.rmeta") | ||
.run(); | ||
rustc() | ||
.crate_type("bin") | ||
.crate_name("baz") | ||
.arg("-Crelocation-model=pic") | ||
.edition("2018") | ||
.input("baz.rs") | ||
.output(bin_name("baz")) | ||
.extern_("bar", rust_lib_name("bar")) | ||
.run_fail() | ||
.assert_stderr_contains( | ||
"crate `foo` required to be available in rlib format, but was not found in this form", | ||
) | ||
.assert_stdout_not_contains("internal compiler error"); | ||
} |
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,17 @@ | ||
// A simple smoke test to check that rustc fails compilation | ||
// and outputs a helpful message when a dependency is missing | ||
// in a dependency chain. | ||
// See https://github.com/rust-lang/rust/issues/12146 | ||
|
||
use run_make_support::{rfs, rust_lib_name, rustc}; | ||
|
||
fn main() { | ||
rustc().crate_type("rlib").input("crateA.rs").run(); | ||
rustc().crate_type("rlib").input("crateB.rs").run(); | ||
rfs::remove_file(rust_lib_name("crateA")); | ||
// Ensure that crateC fails to compile, as the crateA dependency is missing. | ||
rustc() | ||
.input("crateC.rs") | ||
.run_fail() | ||
.assert_stderr_contains("can't find crate for `crateA` which `crateB` depends on"); | ||
} |
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,12 @@ | ||
// The flag `--output-format` is unauthorized on beta and stable releases, which led | ||
// to confusion for maintainers doing testing on nightly. Tying it to an unstable flag | ||
// elucidates this, and this test checks that `--output-format` cannot be passed on its | ||
// own. | ||
// See https://github.com/rust-lang/rust/pull/82497 | ||
|
||
use run_make_support::{diff, rustdoc}; | ||
|
||
fn main() { | ||
let out = rustdoc().output_format("json").input("x.html").run_fail().stderr_utf8(); | ||
diff().expected_file("output-format-json.stderr").actual_text("actual-json", out).run(); | ||
} |