Add match arm for Fuchsia status code upon an abort in a test
This change adds ZX_TASK_RETCODE_EXCEPTION_KILL as an expected status code upon an abort in a test on Fuchsia. Tests fixes #127539
This commit is contained in:
parent
24d2ac0b56
commit
1aad89d11c
@ -21,6 +21,14 @@
|
||||
#[cfg(windows)]
|
||||
const STATUS_ABORTED: i32 = 0xC0000409u32 as i32;
|
||||
|
||||
// On Zircon (the Fuchsia kernel), an abort from userspace calls the
|
||||
// LLVM implementation of __builtin_trap(), e.g., ud2 on x86, which
|
||||
// raises a kernel exception. If a userspace process does not
|
||||
// otherwise arrange exception handling, the kernel kills the process
|
||||
// with this return code.
|
||||
#[cfg(target_os = "fuchsia")]
|
||||
const ZX_TASK_RETCODE_EXCEPTION_KILL: i32 = -1028;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum TestResult {
|
||||
TrOk,
|
||||
@ -105,6 +113,9 @@ pub fn get_result_from_exit_code(
|
||||
}
|
||||
None => unreachable!("status.code() returned None but status.signal() was None"),
|
||||
},
|
||||
// Upon an abort, Fuchsia returns the status code ZX_TASK_RETCODE_EXCEPTION_KILL.
|
||||
#[cfg(target_os = "fuchsia")]
|
||||
Some(ZX_TASK_RETCODE_EXCEPTION_KILL) => TestResult::TrFailed,
|
||||
#[cfg(not(unix))]
|
||||
None => TestResult::TrFailedMsg(format!("unknown return code")),
|
||||
#[cfg(any(windows, unix))]
|
||||
|
@ -1,9 +1,9 @@
|
||||
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:35:5:
|
||||
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:34:5:
|
||||
assertion `left == right` failed
|
||||
left: 2
|
||||
right: 4
|
||||
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
|
||||
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:29:5:
|
||||
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:28:5:
|
||||
assertion `left == right` failed
|
||||
left: 2
|
||||
right: 4
|
||||
|
@ -17,7 +17,7 @@ hello, world
|
||||
testing123
|
||||
---- it_fails stderr ----
|
||||
testing321
|
||||
thread 'main' panicked at $DIR/test-panic-abort.rs:40:5:
|
||||
thread 'main' panicked at $DIR/test-panic-abort.rs:39:5:
|
||||
assertion `left == right` failed
|
||||
left: 2
|
||||
right: 5
|
||||
|
Loading…
Reference in New Issue
Block a user