Skip to content

fix: remove unnecessary workaround in standard_lib test #15522

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
May 20, 2025

Conversation

motorailgun
Copy link
Contributor

@motorailgun motorailgun commented May 13, 2025

What does this PR try to resolve?

@rustbot
Copy link
Collaborator

rustbot commented May 13, 2025

r? @epage

rustbot has assigned @epage.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 13, 2025
@motorailgun
Copy link
Contributor Author

Oops, fixing tests...

@motorailgun motorailgun force-pushed the unnecessary-workaround branch 3 times, most recently from 0ecfd35 to c24644f Compare May 15, 2025 15:15
@motorailgun
Copy link
Contributor Author

I must admit that I'm kind of stuck here. The original issue, where ld needed to be present inside sysroot on x86_64-unknown-linux-gnu, must be solved and looks to be not happening anymore. However, for the test standard_lib::shared_std_dependency_rebuild, I could not find the cause of the E0460, or judge if this is an intentional behavior.

@weihanglo Would you mind looking into the failing test if possible...?

// more information.
// args.push("--sysroot".to_string());
// args.push("/path/to/nowhere".to_string());
args.push("--sysroot".to_string());
Copy link
Member

Choose a reason for hiding this comment

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

Because the hack predates the test build_std_with_no_arg_for_core_only_target, which really requires a target shared library from sysroot, for example ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/aarch64-unknown-none/lib/

Copy link
Member

Choose a reason for hiding this comment

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

One way to fix this is also ensure that the --target passed in is rustc host target.

Copy link
Contributor Author

@motorailgun motorailgun May 20, 2025

Choose a reason for hiding this comment

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

Oh I see. Well, ensuring that passed --target is the host target seems a good way to go.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(By the way, thank you for your advice)

@motorailgun motorailgun force-pushed the unnecessary-workaround branch from c24644f to 72eec5e Compare May 20, 2025 08:20
@motorailgun motorailgun force-pushed the unnecessary-workaround branch from 72eec5e to ff1849f Compare May 20, 2025 08:23
@motorailgun motorailgun requested a review from weihanglo May 20, 2025 08:40
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks!

@weihanglo weihanglo added this pull request to the merge queue May 20, 2025
Merged via the queue into rust-lang:master with commit c36e6f2 May 20, 2025
23 checks passed
bors added a commit to rust-lang/rust that referenced this pull request May 23, 2025
Update cargo

9 commits in 47c911e9e6f6461f90ce19142031fe16876a3b95..68db37499f2de8acef704c73d9031be6fbcbaee4
2025-05-14 17:53:17 +0000 to 2025-05-22 14:27:15 +0000
- chore(gh): Add new-lint issue template (rust-lang/cargo#15575)
- fix(toml): Remove workaround for rustc frontmatter support (rust-lang/cargo#15570)
- fix(vendor)!: vendor files with .rej/.orig suffix (rust-lang/cargo#15569)
- fix(vendor)!: direct extraction for registry sources (rust-lang/cargo#15514)
- chore(deps): update msrv (1 version) to v1.87 (rust-lang/cargo#15530)
- Fix comment for cargo/core/compiler/fingerprint/mod.rs (rust-lang/cargo#15565)
- fix: remove unnecessary workaround in standard_lib test (rust-lang/cargo#15522)
- Allow configuring arbitrary codegen backends (rust-lang/cargo#15562)
- Update dependencies (rust-lang/cargo#15557)

r? ghost
@rustbot rustbot added this to the 1.89.0 milestone May 24, 2025
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request May 25, 2025
Update cargo

9 commits in 47c911e9e6f6461f90ce19142031fe16876a3b95..68db37499f2de8acef704c73d9031be6fbcbaee4
2025-05-14 17:53:17 +0000 to 2025-05-22 14:27:15 +0000
- chore(gh): Add new-lint issue template (rust-lang/cargo#15575)
- fix(toml): Remove workaround for rustc frontmatter support (rust-lang/cargo#15570)
- fix(vendor)!: vendor files with .rej/.orig suffix (rust-lang/cargo#15569)
- fix(vendor)!: direct extraction for registry sources (rust-lang/cargo#15514)
- chore(deps): update msrv (1 version) to v1.87 (rust-lang/cargo#15530)
- Fix comment for cargo/core/compiler/fingerprint/mod.rs (rust-lang/cargo#15565)
- fix: remove unnecessary workaround in standard_lib test (rust-lang/cargo#15522)
- Allow configuring arbitrary codegen backends (rust-lang/cargo#15562)
- Update dependencies (rust-lang/cargo#15557)

r? ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants