diff options
| author | Charles Celerier <chcl@google.com> | 2024-07-10 03:43:15 +0000 |
|---|---|---|
| committer | Charles Celerier <chcl@google.com> | 2024-07-15 22:21:41 +0000 |
| commit | deb8ebb39b1fa8ab1436bf224df434273a6c58c6 (patch) | |
| tree | 716aa8c4b86b197ee8975f0e7929a9f692155da4 | |
| parent | 1aad89d11ca9e52fa0442c75bb3d9dee9635cbb7 (diff) | |
| download | rust-deb8ebb39b1fa8ab1436bf224df434273a6c58c6.tar.gz rust-deb8ebb39b1fa8ab1436bf224df434273a6c58c6.zip | |
Update name of Windows abort constant to match platform documentation
| -rw-r--r-- | library/test/src/test_result.rs | 4 | ||||
| -rw-r--r-- | tests/ui/test-attrs/test-panic-abort-nocapture.rs | 1 | ||||
| -rw-r--r-- | tests/ui/test-attrs/test-panic-abort.rs | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/library/test/src/test_result.rs b/library/test/src/test_result.rs index cecf747f531..98c54f038da 100644 --- a/library/test/src/test_result.rs +++ b/library/test/src/test_result.rs @@ -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, diff --git a/tests/ui/test-attrs/test-panic-abort-nocapture.rs b/tests/ui/test-attrs/test-panic-abort-nocapture.rs index c2c3d6d547d..f3485d9c1fa 100644 --- a/tests/ui/test-attrs/test-panic-abort-nocapture.rs +++ b/tests/ui/test-attrs/test-panic-abort-nocapture.rs @@ -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)] diff --git a/tests/ui/test-attrs/test-panic-abort.rs b/tests/ui/test-attrs/test-panic-abort.rs index 0c44acaffd7..84740161a70 100644 --- a/tests/ui/test-attrs/test-panic-abort.rs +++ b/tests/ui/test-attrs/test-panic-abort.rs @@ -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)] |