Skip to content

Commit

Permalink
Update name of Windows abort constant to match platform documentation
Browse files Browse the repository at this point in the history
c6c7 committed Jul 15, 2024
1 parent 1aad89d commit deb8ebb
Showing 3 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions library/test/src/test_result.rs
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ pub const TR_OK: i32 = 50;
// On Windows we use __fastfail to abort, which is documented to use this
// exception code.
#[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
// 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() {
Some(TR_OK) => TestResult::TrOk,
#[cfg(windows)]
Some(STATUS_ABORTED) => TestResult::TrFailed,
Some(STATUS_FAIL_FAST_EXCEPTION) => TestResult::TrFailed,
#[cfg(unix)]
None => match status.signal() {
Some(libc::SIGABRT) => TestResult::TrFailed,
1 change: 0 additions & 1 deletion tests/ui/test-attrs/test-panic-abort-nocapture.rs
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
//@ ignore-wasm no panic or subprocess support
//@ ignore-emscripten no panic or subprocess support
//@ ignore-sgx no subprocess support
//@ ignore-fuchsia code returned as ZX_TASK_RETCODE_EXCEPTION_KILL, FIXME (#127539)

#![cfg(test)]

1 change: 0 additions & 1 deletion tests/ui/test-attrs/test-panic-abort.rs
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
//@ ignore-wasm no panic or subprocess support
//@ ignore-emscripten no panic or subprocess support
//@ ignore-sgx no subprocess support
//@ ignore-fuchsia code returned as ZX_TASK_RETCODE_EXCEPTION_KILL, FIXME (#127539)

#![cfg(test)]
#![feature(test)]

0 comments on commit deb8ebb

Please sign in to comment.