Skip to content

Commit deb8ebb

Browse files
committed
Update name of Windows abort constant to match platform documentation
1 parent 1aad89d commit deb8ebb

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

library/test/src/test_result.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ 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;
2323

2424
// On Zircon (the Fuchsia kernel), an abort from userspace calls the
2525
// LLVM implementation of __builtin_trap(), e.g., ud2 on x86, which
@@ -104,7 +104,7 @@ pub fn get_result_from_exit_code(
104104
let result = match status.code() {
105105
Some(TR_OK) => TestResult::TrOk,
106106
#[cfg(windows)]
107-
Some(STATUS_ABORTED) => TestResult::TrFailed,
107+
Some(STATUS_FAIL_FAST_EXCEPTION) => TestResult::TrFailed,
108108
#[cfg(unix)]
109109
None => match status.signal() {
110110
Some(libc::SIGABRT) => TestResult::TrFailed,

tests/ui/test-attrs/test-panic-abort-nocapture.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
//@ ignore-wasm no panic or subprocess support
1111
//@ ignore-emscripten no panic or subprocess support
1212
//@ ignore-sgx no subprocess support
13-
//@ ignore-fuchsia code returned as ZX_TASK_RETCODE_EXCEPTION_KILL, FIXME (#127539)
1413

1514
#![cfg(test)]
1615

tests/ui/test-attrs/test-panic-abort.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
//@ ignore-wasm no panic or subprocess support
1111
//@ ignore-emscripten no panic or subprocess support
1212
//@ ignore-sgx no subprocess support
13-
//@ ignore-fuchsia code returned as ZX_TASK_RETCODE_EXCEPTION_KILL, FIXME (#127539)
1413

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

0 commit comments

Comments
 (0)