Skip to content

tools: remote-test-server: Fix UEFI crash return code - #164617

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
Ayush1325:uefi-tests
Oct 26, 2026
Merged

tools: remote-test-server: Fix UEFI crash return code#164617
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
Ayush1325:uefi-tests

Conversation

@Ayush1325

@Ayush1325 Ayush1325 commented Oct 20, 2026

Copy link
Copy Markdown
Contributor
  • compiletest detects crash as an error code > 127.
  • This does not work for UEFI, since UEFI errors are usize by default, and when converting to i32, we just remove the bits in middle. Eg: 0x8000000000000007 becomes 0x80000007
  • So in case of crash, we get a negetive value as error instead of the expected signal when the host is linux.

@Ayush1325
tools: remote-test-server: Fix UEFI crash return code
f608dbf 
- compiletest detects crash as an error code > 127.
- This does not work for UEFI, since UEFI errors are usize by default,
  and when converting to i32, we just remove the bits in middle. Eg:
  0x8000000000000007 becomes 0x80000007
- So in case of crash, we get a negetive value as error  instead of
  the expected signal when the host is linux.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
@rustbot rustbot added 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. labels Oct 20, 2026
@rustbot

rustbot commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Fallback group: @Mark-Simulacrum, @jieyouxu
  • @Mark-Simulacrum, @jieyouxu expanded to Mark-Simulacrum, jieyouxu
  • Random selection from Mark-Simulacrum, jieyouxu

Mark-Simulacrum
Mark-Simulacrum requested changes Oct 25, 2026
View reviewed changes
Comment thread src/tools/remote-test-server/src/main.rs
#[cfg(target_os = "uefi")]
fn get_status_code(status: &ExitStatus) -> (u8, i32) {
let status = status.code().unwrap();
if (status & i32::MIN) != 0 { (1, status & !i32::MIN) } else { (0, status) }

@Mark-Simulacrum Mark-Simulacrum Oct 25, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think this is 'just' getting the sign bit, and if it's negative returning (1, positive value)?

Is there a reason we're not writing that more directly?

View changes since the review

@Ayush1325 Ayush1325 Oct 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Well, I wrote it this way to mirror what we do when constructing the error code in std:

rust/library/std/src/sys/process/uefi.rs

Line 252 in dc44e7f

if self.0.is_error() {

I don't particularly mind changing it to just check for the sign, but this way of writing it kinda preserves that UEFI doesn't actuallly have an i32 error code. Just a code desguised as i32 (at least to me).

@Mark-Simulacrum Mark-Simulacrum Oct 25, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hm, okay, I guess that seems reasonable enough.

@rustbot rustbot 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 Oct 25, 2026
@rustbot

rustbot commented Oct 25, 2026

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@Mark-Simulacrum

Mark-Simulacrum commented Oct 25, 2026

Copy link
Copy Markdown
Member

@bors r+

@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f608dbf has been approved by Mark-Simulacrum

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 25, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Oct 26, 2026
@JonathanBrouwer
Rollup merge of rust-lang#164617 - Ayush1325:uefi-tests, r=Mark-Simul…
e8b4f54 
…acrum

tools: remote-test-server: Fix UEFI crash return code

- compiletest detects crash as an error code > 127.
- This does not work for UEFI, since UEFI errors are usize by default, and when converting to i32, we just remove the bits in middle. Eg: 0x8000000000000007 becomes 0x80000007
- So in case of crash, we get a negetive value as error  instead of the expected signal when the host is linux.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Oct 26, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Oct 26, 2026
@JonathanBrouwer
Rollup merge of rust-lang#164617 - Ayush1325:uefi-tests, r=Mark-Simul…
3a7f1c1 
…acrum

tools: remote-test-server: Fix UEFI crash return code

- compiletest detects crash as an error code > 127.
- This does not work for UEFI, since UEFI errors are usize by default, and when converting to i32, we just remove the bits in middle. Eg: 0x8000000000000007 becomes 0x80000007
- So in case of crash, we get a negetive value as error  instead of the expected signal when the host is linux.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Oct 26, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Oct 26, 2026
@bors
Auto merge of #164940 - JonathanBrouwer:rollup-rCORLRu, r=JonathanBro…
9cd92f4 
…uwer

Rollup of 6 pull requests

Successful merges:

 - #164617 (tools: remote-test-server: Fix UEFI crash return code)
 - #164549 (feat!: change return type of `TryFromIntError::kind`)
 - #164893 (Add diagnostic items for env::vars / env::vars_os)
 - #164897 (Add regression test for CoerceShared impl with unnormalizable target)
 - #164908 (Add regression test for self referential inherent associated type ICE)
 - #164925 (Cleanup `rustdoc-html` tests)
@jhpratt jhpratt mentioned this pull request Oct 26, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Oct 26, 2026
@bors
Auto merge of #164957 - jhpratt:rollup-K63QGYN, r=jhpratt
aaf324d 
Rollup of 6 pull requests

Successful merges:

 - #164617 (tools: remote-test-server: Fix UEFI crash return code)
 - #164549 (feat!: change return type of `TryFromIntError::kind`)
 - #164893 (Add diagnostic items for env::vars / env::vars_os)
 - #164897 (Add regression test for CoerceShared impl with unnormalizable target)
 - #164908 (Add regression test for self referential inherent associated type ICE)
 - #164926 (Remove `type_array` from `rustc_codegen_ssa`)
@rust-bors
rust-bors Bot merged commit 81dd75a into rust-lang:main Oct 26, 2026
14 checks passed
rust-bors Bot pushed a commit that referenced this pull request Oct 26, 2026
@bors
Unrolled build for #164617 in rollup 164957
b706fdf 
Rollup merge of #164617 - Ayush1325:uefi-tests, r=Mark-Simulacrum

tools: remote-test-server: Fix UEFI crash return code

- compiletest detects crash as an error code > 127.
- This does not work for UEFI, since UEFI errors are usize by default, and when converting to i32, we just remove the bits in middle. Eg: 0x8000000000000007 becomes 0x80000007
- So in case of crash, we get a negetive value as error  instead of the expected signal when the host is linux.
@rustbot rustbot added this to the 1.101.0 milestone Oct 26, 2026
@Ayush1325
Ayush1325 deleted the uefi-tests branch October 26, 2026 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum requested changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

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.

Projects

None yet

Milestone

1.101.0

Development

Successfully merging this pull request may close these issues.

3 participants

@Ayush1325 @rustbot @Mark-Simulacrum