nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #134829 - jieyouxu:migrate-libs-through-symlinks, r=lqd

Browse Source 
Migrate `libs-through-symlink` to rmake.rs

Part of https://github.com/rust-lang/rust/issues/121876.

This PR migrates `tests/run-make/libs-through-symlink/` to use rmake.rs.

- Regression test for #13890.
- Original fix PR is #13903.
- Document test intent, backlink to #13890 and fix PR #13903.
- Fix the test logic: the `Makefile` version seems to not actually be exercising the "library search traverses symlink" logic, because the actual symlinked-to-library is present under the `$(TMPDIR)` directory tree when `bar.rs` is compiled, because the `$(RUSTC)` invocation has an implicit `-L $(TMPDIR)`. The symlink itself was actually broken, i.e. it should've been `ln -nsf $(TMPDIR)/outdir/$(NAME) $(TMPDIR)` but it used `ln -nsf outdir/$(NAME) $(TMPDIR)`. The rmake.rs version now explicitly separates the two directory trees and sets the CWD of the `bar.rs` rustc invocation so that the actual library is *not* present under its CWD tree.

I.e. it is now

```
$test_output/           # rustc foo.rs -o actual_lib_dir/libfoo.rlib
    actual_lib_dir/
        libfoo.rlib
    symlink_lib_dir/    # CWD set; rustc -L . bar.rs
        libfoo.rlib --> $test_output/actual_lib_dir/libfoo.rlib
```

Partially supersedes #129011.
This PR is co-authored with `@Oneirical.`

r? compiler
This commit is contained in:
Stuart Cook 2024-12-28 16:50:38 +11:00 committed by GitHub
commit 3048c4adfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View File

@ -1,7 +1,6 @@
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
tests/run-make/libs-through-symlinks/Makefile
View File

@ -1,22 +0,0 @@
# ignore-cross-compile
include ../tools.mk
# ignore-windows
# The option -n for the AIX ln command has a different purpose than it does
# on Linux. On Linux, the -n option is used to treat the destination path as
# normal file if it is a symbolic link to a directory, which is the default
# behavior of the AIX ln command.
ifeq ($(UNAME),AIX)
LN_FLAGS := -sf
else
LN_FLAGS := -nsf
endif
NAME := $(shell $(RUSTC) --print file-names foo.rs)
all:
mkdir -p $(TMPDIR)/outdir
$(RUSTC) foo.rs -o $(TMPDIR)/outdir/$(NAME)
ln $(LN_FLAGS) outdir/$(NAME) $(TMPDIR)
RUSTC_LOG=rustc_metadata::loader $(RUSTC) bar.rs

48
tests/run-make/libs-through-symlinks/rmake.rs Normal file
View File

@ -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();
}