mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update name of Windows abort constant to match platform documentation

Browse Source
This commit is contained in:
Charles Celerier 2024-07-10 03:43:15 +00:00
parent 1aad89d11c
commit deb8ebb39b
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/test/src/test_result.rs
View File

@ -19,7 +19,7 @@
// On Windows we use __fastfail to abort, which is documented to use this // On Windows we use __fastfail to abort, which is documented to use this
// exception code. // exception code.
#[cfg(windows)] #[cfg(windows)]
const STATUS_ABORTED: i32 = 0xC0000409u32 as i32; const STATUS_FAIL_FAST_EXCEPTION: i32 = 0xC0000409u32 as i32;
// On Zircon (the Fuchsia kernel), an abort from userspace calls the // On Zircon (the Fuchsia kernel), an abort from userspace calls the
// LLVM implementation of __builtin_trap(), e.g., ud2 on x86, which // LLVM implementation of __builtin_trap(), e.g., ud2 on x86, which
@ -104,7 +104,7 @@ pub fn get_result_from_exit_code(
let result = match status.code() { let result = match status.code() {
Some(TR_OK) => TestResult::TrOk, Some(TR_OK) => TestResult::TrOk,
#[cfg(windows)] #[cfg(windows)]
Some(STATUS_ABORTED) => TestResult::TrFailed, Some(STATUS_FAIL_FAST_EXCEPTION) => TestResult::TrFailed,
#[cfg(unix)] #[cfg(unix)]
None => match status.signal() { None => match status.signal() {
Some(libc::SIGABRT) => TestResult::TrFailed, Some(libc::SIGABRT) => TestResult::TrFailed,

1
tests/ui/test-attrs/test-panic-abort-nocapture.rs
View File

@ -10,7 +10,6 @@
//@ ignore-wasm no panic or subprocess support //@ ignore-wasm no panic or subprocess support
//@ ignore-emscripten no panic or subprocess support //@ ignore-emscripten no panic or subprocess support
//@ ignore-sgx no subprocess support //@ ignore-sgx no subprocess support
//@ ignore-fuchsia code returned as ZX_TASK_RETCODE_EXCEPTION_KILL, FIXME (#127539)
#![cfg(test)] #![cfg(test)]

1
tests/ui/test-attrs/test-panic-abort.rs
View File

@ -10,7 +10,6 @@
//@ ignore-wasm no panic or subprocess support //@ ignore-wasm no panic or subprocess support
//@ ignore-emscripten no panic or subprocess support //@ ignore-emscripten no panic or subprocess support
//@ ignore-sgx no subprocess support //@ ignore-sgx no subprocess support
//@ ignore-fuchsia code returned as ZX_TASK_RETCODE_EXCEPTION_KILL, FIXME (#127539)
#![cfg(test)] #![cfg(test)]
#![feature(test)] #![feature(test)]