Skip to content

Migrate libs-through-symlink to rmake.rs #134829

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.

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

Merged
merged 1 commit into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ run-make/branch-protection-check-IBT/Makefile
run-make/cat-and-grep-sanity-check/Makefile
run-make/extern-fn-reachable/Makefile
run-make/jobserver-error/Makefile
run-make/libs-through-symlinks/Makefile
run-make/split-debuginfo/Makefile
run-make/symbol-mangling-hashed/Makefile
run-make/translation/Makefile
22 changes: 0 additions & 22 deletions tests/run-make/libs-through-symlinks/Makefile

This file was deleted.

48 changes: 48 additions & 0 deletions tests/run-make/libs-through-symlinks/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//! Regression test for [rustc doesn't handle relative symlinks to libraries
//! #13890](https://github.com/rust-lang/rust/issues/13890).
//!
//! This smoke test checks that for a given library search path `P`:
//!
//! - `rustc` is able to locate a library available via a symlink, where:
//! - the symlink is under the directory subtree of `P`,
//! - but the actual library is not (it's in a different directory subtree).
//!
//! For example:
//!
//! ```text
//! actual_dir/
//! libfoo.rlib
//! symlink_dir/ # $CWD set; rustc -L . bar.rs that depends on foo
//! libfoo.rlib --> ../actual_dir/libfoo.rlib
//! ```
//!
//! Previously, if `rustc` was invoked with CWD set to `symlink_dir/`, it would fail to traverse the
//! symlink to locate `actual_dir/libfoo.rlib`. This was originally fixed in
//! <https://github.com/rust-lang/rust/pull/13903>.

//@ ignore-cross-compile

use run_make_support::{bare_rustc, cwd, path, rfs, rust_lib_name};

fn main() {
let actual_lib_dir = path("actual_lib_dir");
let symlink_lib_dir = path("symlink_lib_dir");
rfs::create_dir_all(&actual_lib_dir);
rfs::create_dir_all(&symlink_lib_dir);

// NOTE: `bare_rustc` is used because it does not introduce an implicit `-L .` library search
// flag.
bare_rustc().input("foo.rs").output(actual_lib_dir.join(rust_lib_name("foo"))).run();

rfs::symlink_file(
actual_lib_dir.join(rust_lib_name("foo")),
symlink_lib_dir.join(rust_lib_name("foo")),
);

// Make rustc's $CWD be in the directory containing the symlink-to-lib.
bare_rustc()
.current_dir(&symlink_lib_dir)
.library_search_path(".")
.input(cwd().join("bar.rs"))
.run();
}
Loading