forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
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 rust-lang#127621 - Oneirical:hypnotest-show, r=jieyouxu Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake Part of rust-lang#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: i686-mingw
- Loading branch information
Showing
10 changed files
with
62 additions
and
34 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
extern crate foo; | ||
|
||
pub fn main() { | ||
let _ = foo::hello_world(); | ||
} |
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,3 @@ | ||
pub fn hello_world() -> i32 { | ||
42 | ||
} |
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,33 @@ | ||
// In this test, the symlink created is invalid (valid relative to the root, but not | ||
// relatively to where it is located), and used to cause an internal | ||
// compiler error (ICE) when passed as a library search path. This was fixed in #26044, | ||
// and this test checks that the invalid symlink is instead simply ignored. | ||
// See https://github.com/rust-lang/rust/issues/26006 | ||
|
||
//@ needs-symlink | ||
//Reason: symlink requires elevated permission in Windows | ||
|
||
use run_make_support::{rfs, rustc}; | ||
|
||
fn main() { | ||
// We create two libs: `bar` which depends on `foo`. We need to compile `foo` first. | ||
rfs::create_dir("out"); | ||
rfs::create_dir("out/foo"); | ||
rustc() | ||
.input("in/foo/lib.rs") | ||
.crate_name("foo") | ||
.crate_type("lib") | ||
.metadata("foo") | ||
.output("out/foo/libfoo.rlib") | ||
.run(); | ||
rfs::create_dir("out/bar"); | ||
rfs::create_dir("out/bar/deps"); | ||
rfs::create_symlink("out/foo/libfoo.rlib", "out/bar/deps/libfoo.rlib"); | ||
// Check that the invalid symlink does not cause an ICE | ||
rustc() | ||
.input("in/bar/lib.rs") | ||
.library_search_path("dependency=out/bar/deps") | ||
.run_fail() | ||
.assert_exit_code(1) | ||
.assert_stderr_not_contains("internal compiler error"); | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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,21 @@ | ||
// A rustdoc bug caused the `feature=bar` syntax for the cfg flag to be interpreted | ||
// wrongly, with `feature=bar` instead of just `bar` being understood as the feature name. | ||
// After this was fixed in #22135, this test checks that this bug does not make a resurgence. | ||
// See https://github.com/rust-lang/rust/issues/22131 | ||
|
||
//@ ignore-cross-compile | ||
// Reason: rustdoc fails to find the "foo" crate | ||
|
||
use run_make_support::{cwd, rustc, rustdoc}; | ||
|
||
fn main() { | ||
rustc().cfg(r#"feature="bar""#).crate_type("lib").input("foo.rs").run(); | ||
rustdoc() | ||
.arg("--test") | ||
.arg("--cfg") | ||
.arg(r#"feature="bar""#) | ||
.library_search_path(cwd()) | ||
.input("foo.rs") | ||
.run() | ||
.assert_stdout_contains("foo.rs - foo (line 1) ... ok"); | ||
} |