Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite and rename issue-22131 and issue-26006 run-make tests to rmake #127621

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Rewrite and rename issue-22131 and issue-26006 run-make tests to rmake #127621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dc08e3
Rewrite and rename issue-22131 to rmake
Oneirical Jul 11, 2024
fc4404c
Rewrite and rename issue-26006 to rmake
Oneirical Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ run-make/interdependent-c-libraries/Makefile
run-make/issue-107094/Makefile
run-make/issue-14698/Makefile
run-make/issue-15460/Makefile
run-make/issue-22131/Makefile
run-make/issue-26006/Makefile
run-make/issue-28595/Makefile
run-make/issue-33329/Makefile
run-make/issue-35164/Makefile
Expand Down
5 changes: 5 additions & 0 deletions tests/run-make/invalid-symlink-search-path/in/bar/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
extern crate foo;

pub fn main() {
let _ = foo::hello_world();
}
3 changes: 3 additions & 0 deletions tests/run-make/invalid-symlink-search-path/in/foo/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pub fn hello_world() -> i32 {
42
}
33 changes: 33 additions & 0 deletions tests/run-make/invalid-symlink-search-path/rmake.rs
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem: the original test even is wonky, because it was expected to succeed by switching out a local libc versus a libc provided from the sysroot. Let's not try to force a success here, but instead merely check the failure is not from an ICE. Here's what I tried locally that passed on a Windows machine with symlink permissions enabled:

// 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::{create_symlink, fs_wrapper, rustc};

fn main() {
    // We create two libs: `bar` which depends on `foo`. We need to compile `foo` first.

    fs_wrapper::create_dir("out");
    fs_wrapper::create_dir("out/foo");
    rustc()
        .input("in/foo/lib.rs")
        .crate_name("foo")
        .crate_type("lib")
        .metadata("foo")
        .output("out/foo/libfoo.rlib")
        .run();
    fs_wrapper::create_dir("out/bar");
    fs_wrapper::create_dir("out/bar/deps");
    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");
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

// in/foo/lib.rs
pub fn hello_world() -> i32 {
    42
}
// in/bar/lib.rs
extern crate foo;

pub fn main() {
    let _ = foo::hello_world();
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very detailed rework, thank you very much. I have added it to this PR.

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");
}
8 changes: 0 additions & 8 deletions tests/run-make/issue-22131/Makefile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions tests/run-make/issue-26006/Makefile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tests/run-make/issue-26006/in/libc/lib.rs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions tests/run-make/issue-26006/in/time/lib.rs
View file
Open in desktop

This file was deleted.

0 tests/run-make/issue-22131/foo.rs → ...s/run-make/rustdoc-cfgspec-parsing/foo.rs
View file
Open in desktop
File renamed without changes.
21 changes: 21 additions & 0 deletions tests/run-make/rustdoc-cfgspec-parsing/rmake.rs
View file
Open in desktop
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");
}
Loading