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.

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

compiletest: include stage0-sysroot libstd dylib in recipe dylib search path #135389

Merged
merged 2 commits into from
Jan 12, 2025

Conversation

jieyouxu
Copy link
Member

To fix some of the failures in COMPILETEST_FORCE_STAGE0=1 ./x test run-make --stage 0. Specifically,

COMPILETEST_FORCE_STAGE0=1 ./x test tests/run-make/rustdoc-default-output/ --stage 0

should now pass.

Fixes #135373. (As in, make some of the run-make tests pass, other run-make tests fail for various reasons against stage0, and generally run-make tests are not guaranteed to pass at stage 0.)

cc @lolbinarycat

r? bootstrap

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 12, 2025
@lolbinarycat
Copy link
Contributor

weirdly, i just got bootstrap itself failing due to not being able to find libstd (i was just trying to run x fmt)

i don't really know how to repro, maybe it has something to do with switching branches, or maybe there was some change to rpath calculation that needs to be reverted.

also one time i had the opposite problem, where there were two possible versions of libstd, and bootstrap (or was it rustc?) couldn't decide which to use.

@jieyouxu
Copy link
Member Author

Sometimes between compiler bumps and bootstrap changes you may need to ./x clean.

@lolbinarycat
Copy link
Contributor

that's a command implemented in the rust side of bootstrap, which i cannot build.

i think i need to rebuild everything, which probably isn't happening today.

@lolbinarycat
Copy link
Contributor

yeah removing build/ and rebuilding everything seemed to fix it.

Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

Seems good to me other than a nit

…ch path

To fix some of the failures in
`COMPILETEST_FORCE_STAGE0=1 ./x test run-make --stage 0`.
@jieyouxu jieyouxu force-pushed the fix-stage0-rustdoc-rmake branch from 18a10b9 to 1665b80 Compare January 12, 2025 05:03
@jieyouxu
Copy link
Member Author

Addressed the nit.
@bors r=@onur-ozkan rollup

@bors
Copy link
Contributor

bors commented Jan 12, 2025

📌 Commit 1665b80 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2025
@jieyouxu jieyouxu assigned onur-ozkan and unassigned clubby789 Jan 12, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2025
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#135266 (Remove emsdk version update from 1.84.0 relnotes)
 - rust-lang#135364 (Cleanup `suggest_binding_for_closure_capture_self` diag in borrowck)
 - rust-lang#135375 (allow rustdoc-js tests to be run at stage0)
 - rust-lang#135379 (Make (unstable API) `UniqueRc` invariant for soundness)
 - rust-lang#135389 (compiletest: include stage0-sysroot libstd dylib in recipe dylib search path)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1380549 into rust-lang:master Jan 12, 2025
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2025
Rollup merge of rust-lang#135389 - jieyouxu:fix-stage0-rustdoc-rmake, r=onur-ozkan

compiletest: include stage0-sysroot libstd dylib in recipe dylib search path

To fix some of the failures in `COMPILETEST_FORCE_STAGE0=1 ./x test run-make --stage 0`. Specifically,

```
COMPILETEST_FORCE_STAGE0=1 ./x test tests/run-make/rustdoc-default-output/ --stage 0
```

should now pass.

Fixes rust-lang#135373. (As in, make *some* of the `run-make` tests pass, other `run-make` tests fail for various reasons against stage0, and generally `run-make` tests are not guaranteed to pass at stage 0.)

cc `@lolbinarycat`

r? bootstrap
@rustbot rustbot added this to the 1.86.0 milestone Jan 12, 2025
@jieyouxu jieyouxu deleted the fix-stage0-rustdoc-rmake branch January 23, 2025 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

run-make tests no longer work at stage 0 at all
6 participants