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

Jump to bottom

fix(build-std): always link to std when testing proc-macros #14850

Merged
merged 2 commits into from
Nov 26, 2024
Merged

fix(build-std): always link to std when testing proc-macros #14850

merged 2 commits into from
Nov 26, 2024

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Fixes #14735

rust-lang/rust#131188 removes libstd.so from sysroot so cargo test -Zbuild-std no longer links to it. That results in a "Library not loaded: @rpath/libstd-[HASH].dylib" when testing a proc macro.

This is a pretty niche use case, though it can be easily reproduced by running cargo test -Zbuild-std in any proc-macro package. Like in serde-rs/serde running it would fail.

This patch adds a special case that if it is cargo run/test against a proc-macro, fill in std dynamic library search path for it.

How should we test and review this PR?

CARGO_RUN_BUILD_STD_TESTS=1 cargo +nightly t --test build-std test_proc_macro

or

git clone https://github.com/serde-rs/serde
cd serde
git switch -d b9dbfcb4ac3b7a663d9efc6eb1387c62302a6fb4
cargo +nightly t --test build-std

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Nov 22, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-build-execution Area: anything dealing with executing the compiler S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 22, 2024
@weihanglo weihanglo added Z-build-std Nightly: build-std A-proc-macro Area: compiling proc-macros labels Nov 22, 2024
@weihanglo weihanglo mentioned this pull request Nov 22, 2024
Closed
ehuss
ehuss approved these changes Nov 26, 2024
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

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

Thanks!

@ehuss ehuss added this pull request to the merge queue Nov 26, 2024
Merged via the queue into rust-lang:master with commit 8ba3ec2 Nov 26, 2024
20 checks passed
@weihanglo weihanglo deleted the proc-macro-test-build-std branch November 26, 2024 16:59
fredszaq added a commit to sonos/dinghy that referenced this pull request Nov 26, 2024
@fredszaq
Revert "Disable proc macro tests for tvOS and watchOS"
15e277a 
This reverts commit 3244bc9.

This can be reenabled as rust-lang/cargo#14735
was fixed via rust-lang/cargo#14850
@fredszaq fredszaq mentioned this pull request Nov 26, 2024
Merged
This was referenced Nov 26, 2024
Merged
Merged
github-merge-queue bot pushed a commit that referenced this pull request Nov 26, 2024
@epage
test(build-std): download deps first (#14861)
c4a9e45 
### What does this PR try to resolve?

Download dependencies first,
So that we can assert the full output of `cargo test` without wildcard.

This regressed since #14850

### How should we test and review this PR?

CI passes.
@weihanglo weihanglo mentioned this pull request Nov 29, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 30, 2024
@bors
Auto merge of rust-lang#133654 - weihanglo:update-cargo, r=weihanglo
76f3ff6 
Update cargo

8 commits in 4c39aaff66862cc0da52fe529aa1990bb8bb9a22..3908f64086a3d7b9af8d87b4da2bd100776c3e61
2024-11-25 16:36:17 +0000 to 2024-11-29 17:32:44 +0000
- chore(deps): update msrv (rust-lang/cargo#14867)
- fix(fix): Migrate cargo script manifests across editions (rust-lang/cargo#14864)
- feat(toml): Allow adding/removing from cargo scripts (rust-lang/cargo#14857)
- Add future-incompat warning against keywords in cfgs and add raw-idents (rust-lang/cargo#14671)
- test(build-std): download deps first (rust-lang/cargo#14861)
- test(pgo): ensure PGO works (rust-lang/cargo#14859)
- git-fetch-with-cli: Set `GIT_DIR` for bare repository compatibility (rust-lang/cargo#14860)
- fix(build-std): always link to std when testing proc-macros (rust-lang/cargo#14850)
@rustbot rustbot added this to the 1.85.0 milestone Nov 30, 2024
@weihanglo weihanglo mentioned this pull request Dec 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2024
@bors
Auto merge of rust-lang#133825 - weihanglo:update-cargo, r=weihanglo
2633e01 
Update cargo

17 commits in 4c39aaff66862cc0da52fe529aa1990bb8bb9a22..05f54fdc34310f458033af8a63ce1d699fae8bf6
2024-11-25 16:36:17 +0000 to 2024-12-03 03:14:12 +0000
- test(pgo): only run on nightly (rust-lang/cargo#14887)
- chore: Bump to 0.86.0; update changelog (rust-lang/cargo#14885)
- docs(ref): Finish a sentence on rust-versions (rust-lang/cargo#14884)
- chore(deps): update rust crate cargo_metadata to 0.19.0 (rust-lang/cargo#14878)
- chore(deps): update rust crate gix to 0.68.0 (rust-lang/cargo#14879)
- fix: Remove default registry reference in `info` cmd docs (rust-lang/cargo#14880)
- test(pgo): determine test runnability at compile time (rust-lang/cargo#14874)
- test: `requires` attribute accepts string literals for cmds (rust-lang/cargo#14875)
- chore(deps): update msrv (3 versions) to v1.81 (rust-lang/cargo#14871)
- chore(deps): update msrv (rust-lang/cargo#14867)
- fix(fix): Migrate cargo script manifests across editions (rust-lang/cargo#14864)
- feat(toml): Allow adding/removing from cargo scripts (rust-lang/cargo#14857)
- Add future-incompat warning against keywords in cfgs and add raw-idents (rust-lang/cargo#14671)
- test(build-std): download deps first (rust-lang/cargo#14861)
- test(pgo): ensure PGO works (rust-lang/cargo#14859)
- git-fetch-with-cli: Set `GIT_DIR` for bare repository compatibility (rust-lang/cargo#14860)
- fix(build-std): always link to std when testing proc-macros (rust-lang/cargo#14850)
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 6, 2024
@bors
Auto merge of #133825 - weihanglo:update-cargo, r=weihanglo
cee432c 
Update cargo

17 commits in 4c39aaff66862cc0da52fe529aa1990bb8bb9a22..05f54fdc34310f458033af8a63ce1d699fae8bf6
2024-11-25 16:36:17 +0000 to 2024-12-03 03:14:12 +0000
- test(pgo): only run on nightly (rust-lang/cargo#14887)
- chore: Bump to 0.86.0; update changelog (rust-lang/cargo#14885)
- docs(ref): Finish a sentence on rust-versions (rust-lang/cargo#14884)
- chore(deps): update rust crate cargo_metadata to 0.19.0 (rust-lang/cargo#14878)
- chore(deps): update rust crate gix to 0.68.0 (rust-lang/cargo#14879)
- fix: Remove default registry reference in `info` cmd docs (rust-lang/cargo#14880)
- test(pgo): determine test runnability at compile time (rust-lang/cargo#14874)
- test: `requires` attribute accepts string literals for cmds (rust-lang/cargo#14875)
- chore(deps): update msrv (3 versions) to v1.81 (rust-lang/cargo#14871)
- chore(deps): update msrv (rust-lang/cargo#14867)
- fix(fix): Migrate cargo script manifests across editions (rust-lang/cargo#14864)
- feat(toml): Allow adding/removing from cargo scripts (rust-lang/cargo#14857)
- Add future-incompat warning against keywords in cfgs and add raw-idents (rust-lang/cargo#14671)
- test(build-std): download deps first (rust-lang/cargo#14861)
- test(pgo): ensure PGO works (rust-lang/cargo#14859)
- git-fetch-with-cli: Set `GIT_DIR` for bare repository compatibility (rust-lang/cargo#14860)
- fix(build-std): always link to std when testing proc-macros (rust-lang/cargo#14850)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehuss ehuss ehuss approved these changes

Assignees

@ehuss ehuss

Labels
A-build-execution Area: anything dealing with executing the compiler A-proc-macro Area: compiling proc-macros S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. Z-build-std Nightly: build-std
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.

Failed testing proc-macros built with -Zbuild-std
3 participants
@weihanglo @rustbot @ehuss