Skip to content

Fix Miri sysroot for x run - #126238

Merged
bors merged 1 commit into
rust-lang:masterfrom
Noratrieb:run,miri,run
Jun 14, 2024
Merged

Fix Miri sysroot for x run#126238
bors merged 1 commit into
rust-lang:masterfrom
Noratrieb:run,miri,run

Conversation

@Noratrieb

@NoratriebNoratrieb commented Jun 10, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Miri no longer (after rust-lang/miri#3411) respects MIRI_SYSROOT and wants to be treated like a REAL rustc, with --sysroot. *pats Miri* sure Miri, just for you :3.

fixes#126233

r? RalfJung (or whoever else feels like it)

@rustbotrustbot added 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 Jun 10, 2024
@RalfJung

RalfJung commented Jun 10, 2024 via email

Copy link
Copy Markdown
Member

@Noratrieb

Noratrieb commented Jun 10, 2024

Copy link
Copy Markdown
MemberAuthor

oh, it probably does. I had it after at first and tested that, and didn't test the reordering >.<

@RalfJung

RalfJung commented Jun 11, 2024

Copy link
Copy Markdown
Member

@rustbot author

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 11, 2024
@Noratrieb

Noratrieb commented Jun 12, 2024

Copy link
Copy Markdown
MemberAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 12, 2024
RalfJung
RalfJung reviewed Jun 12, 2024
View reviewed changes
Comment threadsrc/bootstrap/src/core/build_steps/run.rs
@Noratrieb
Fix Miri sysroot for x run
a1667a9
Miri no longer respects `MIRI_SYSROOT` and wants to be treated like a
REAL rustc, with `--sysroot`. *pats Miri* sure Miri, just for you :3.
@RalfJung

RalfJung commented Jun 13, 2024

Copy link
Copy Markdown
Member

Thanks. :)

@bors r+ rollup

@bors

bors commented Jun 13, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit a1667a9 has been approved by RalfJung

It is now in the queue for this repository.

@borsbors 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 Jun 13, 2024
@rust-log-analyzer

rust-log-analyzer commented Jun 13, 2024

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
.......... (120/124)
...F (124/124)
/checkout/tests/rustdoc-gui/help-page.goml help-page... FAILED
[ERROR] `tests/rustdoc-gui/utils.goml` line 16
from `tests/rustdoc-gui/help-page.goml` line 23
from `tests/rustdoc-gui/help-page.goml` line 32: Error: Evaluation failed: The following errors happened: [localStorage item "rustdoc-theme" (of value "ayu") != "null"]: for command `assert-local-storage: {"rustdoc-theme": |theme|}`
Error: ()
Build completed unsuccessfully in 0:03:34
local time: Thu Jun 13 19:01:57 UTC 2024
network time: Thu, 13 Jun 2024 19:01:57 GMT

@lqd

lqd commented Jun 13, 2024

Copy link
Copy Markdown
Member

(cc #126430 on that last PR CI failure)

@Noratrieb

Noratrieb commented Jun 13, 2024

Copy link
Copy Markdown
MemberAuthor

@bors retry

@lqd

lqd commented Jun 13, 2024

Copy link
Copy Markdown
Member

it's PR CI @Nilstrieb :3 not bors tests

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 13, 2024
@matthiaskrgr
Rollup merge ofrust-lang#126238- Nilstrieb:run,miri,run, r=RalfJung
016fc2e
Fix Miri sysroot for `x run`
Miri no longer (after rust-lang/miri#3411) respects `MIRI_SYSROOT` and wants to be treated like a REAL rustc, with `--sysroot`. \*pats Miri\* sure Miri, just for you :3.
fixesrust-lang#126233
r? RalfJung (or whoever else feels like it)
@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 13, 2024
Closed
@Noratrieb

Noratrieb commented Jun 13, 2024

Copy link
Copy Markdown
MemberAuthor

just because i have bors perms does not mean i can read

@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 13, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
@bors
Auto merge ofrust-lang#126439- matthiaskrgr:rollup-856xt18, r=matth…
8ff13a6
…iaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
- rust-lang#126088 ([1/2] clean-up / general improvements)
- rust-lang#126238 (Fix Miri sysroot for `x run`)
- rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
- rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
- rust-lang#126371 (Tweak output of import suggestions)
- rust-lang#126388 (const-eval: make lint scope computation consistent)
- rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
- rust-lang#126392 (Small style improvement in `gvn.rs`)
- rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
@bors
Auto merge ofrust-lang#126439- matthiaskrgr:rollup-856xt18, r=matth…
bfa098e
…iaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
- rust-lang#126088 ([1/2] clean-up / general improvements)
- rust-lang#126238 (Fix Miri sysroot for `x run`)
- rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
- rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
- rust-lang#126371 (Tweak output of import suggestions)
- rust-lang#126388 (const-eval: make lint scope computation consistent)
- rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
- rust-lang#126392 (Small style improvement in `gvn.rs`)
- rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 24c94f0 into rust-lang:masterJun 14, 2024
@rustbotrustbot added this to the 1.81.0 milestone Jun 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
@rust-timer
Unrolled build forrust-lang#126238
f7c804f
Rollup merge of rust-lang#126238 - Nilstrieb:run,miri,run, r=RalfJung
Fix Miri sysroot for `x run`
Miri no longer (after rust-lang/miri#3411) respects `MIRI_SYSROOT` and wants to be treated like a REAL rustc, with `--sysroot`. \*pats Miri\* sure Miri, just for you :3.
fixesrust-lang#126233
r? RalfJung (or whoever else feels like it)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments

Assignees

@RalfJungRalfJung

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.81.0

Development

Successfully merging this pull request may close these issues.

"./x.py run miri --stage 1" no longer works

6 participants

@Noratrieb@RalfJung@bors@rust-log-analyzer@lqd@rustbot