Skip to content

Commit c99ebd4

Browse files
authored
Rollup merge of rust-lang#127594 - c6c7:fuchsia-status-code-match-arm, r=tmandry
Fuchsia status code match arm Adds a match arm for the Fuchsia status code upon a process abort. An additional change moves the Windows status code down into the match arm itself instead of being defined as a constant elsewhere. r​? tmandry
2 parents d1d9893 + d50143f commit c99ebd4

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

test/src/test_result.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@ pub const TR_OK: i32 = 50;
1919
// On Windows we use __fastfail to abort, which is documented to use this
2020
// exception code.
2121
#[cfg(windows)]
22-
const STATUS_ABORTED: i32 = 0xC0000409u32 as i32;
22+
const STATUS_FAIL_FAST_EXCEPTION: i32 = 0xC0000409u32 as i32;
23+
24+
// On Zircon (the Fuchsia kernel), an abort from userspace calls the
25+
// LLVM implementation of __builtin_trap(), e.g., ud2 on x86, which
26+
// raises a kernel exception. If a userspace process does not
27+
// otherwise arrange exception handling, the kernel kills the process
28+
// with this return code.
29+
#[cfg(target_os = "fuchsia")]
30+
const ZX_TASK_RETCODE_EXCEPTION_KILL: i32 = -1028;
2331

2432
#[derive(Debug, Clone, PartialEq)]
2533
pub enum TestResult {
@@ -96,7 +104,7 @@ pub fn get_result_from_exit_code(
96104
let result = match status.code() {
97105
Some(TR_OK) => TestResult::TrOk,
98106
#[cfg(windows)]
99-
Some(STATUS_ABORTED) => TestResult::TrFailed,
107+
Some(STATUS_FAIL_FAST_EXCEPTION) => TestResult::TrFailed,
100108
#[cfg(unix)]
101109
None => match status.signal() {
102110
Some(libc::SIGABRT) => TestResult::TrFailed,
@@ -105,6 +113,9 @@ pub fn get_result_from_exit_code(
105113
}
106114
None => unreachable!("status.code() returned None but status.signal() was None"),
107115
},
116+
// Upon an abort, Fuchsia returns the status code ZX_TASK_RETCODE_EXCEPTION_KILL.
117+
#[cfg(target_os = "fuchsia")]
118+
Some(ZX_TASK_RETCODE_EXCEPTION_KILL) => TestResult::TrFailed,
108119
#[cfg(not(unix))]
109120
None => TestResult::TrFailedMsg(format!("unknown return code")),
110121
#[cfg(any(windows, unix))]

0 commit comments

Comments
 (0)