[nextest-runner] make Windows job object termination clearer

In case of a Ctrl-C grace period expiring, we should make it clear to users
what's happening rather than just printing out "FAIL".

Also make a slight formatting tweak.

nextest-runner/src/errors.rs

@@ -6,7 +6,7 @@
 use crate::{
     cargo_config::{TargetTriple, TargetTripleSource},
     config::{ConfigExperimental, CustomTestGroup, ScriptId, TestGroup},
-    helpers::{display_exit_status, dylib_path_envvar},
+    helpers::{display_exited_with, dylib_path_envvar},
     redact::Redactor,
     reuse_build::{ArchiveFormat, ArchiveStep},
     target_runner::PlatformRunnerSource,
@@ -873,9 +873,9 @@ pub enum CreateTestListError {
 
     /// Running a command to gather the list of tests failed failed with a non-zero exit code.
     #[error(
-        "for `{binary_id}`, command `{}` exited with {}\n--- stdout:\n{}\n--- stderr:\n{}\n---",
+        "for `{binary_id}`, command `{}` {}\n--- stdout:\n{}\n--- stderr:\n{}\n---",
         shell_words::join(command),
-        display_exit_status(*exit_status),
+        display_exited_with(*exit_status),
         String::from_utf8_lossy(stdout),
         String::from_utf8_lossy(stderr),
     )]

nextest-runner/src/helpers.rs

@@ -296,36 +296,39 @@ impl fmt::Display for FormattedDuration {
     }
 }
 
-pub(crate) fn display_exit_status(exit_status: ExitStatus) -> String {
+// "exited with"/"terminated via"
+pub(crate) fn display_exited_with(exit_status: ExitStatus) -> String {
     match AbortStatus::extract(exit_status) {
         Some(abort_status) => display_abort_status(abort_status),
         None => match exit_status.code() {
-            Some(code) => format!("exit code {}", code),
-            None => "an unknown error".to_owned(),
+            Some(code) => format!("exited with exit code {}", code),
+            None => "exited with an unknown error".to_owned(),
         },
     }
 }
 
-/// Display the abort status.
+/// Displays the abort status.
 pub(crate) fn display_abort_status(abort_status: AbortStatus) -> String {
     match abort_status {
         #[cfg(unix)]
         AbortStatus::UnixSignal(sig) => match crate::helpers::signal_str(sig) {
             Some(s) => {
-                format!("signal {sig} (SIG{s})")
+                format!("aborted with signal {sig} (SIG{s})")
             }
             None => {
-                format!("signal {sig}")
+                format!("aborted with signal {sig}")
             }
         },
         #[cfg(windows)]
         AbortStatus::WindowsNtStatus(nt_status) => {
             format!(
-                "code {}",
+                "aborted with code {}",
                 // TODO: pass down a style here
                 crate::helpers::display_nt_status(nt_status, Style::new())
             )
         }
+        #[cfg(windows)]
+        AbortStatus::JobObject => "terminated via job object".to_string(),
     }
 }
 

nextest-runner/src/reporter/displayer.rs

@@ -1319,11 +1319,11 @@ impl<'a> TestReporterImpl<'a> {
         // On Windows, also print out the exception if available.
         #[cfg(windows)]
         if let ExecutionResult::Fail {
-            abort_status: Some(AbortStatus::WindowsNtStatus(nt_status)),
+            abort_status: Some(abort_status),
             leaked: _,
         } = last_status.result
         {
-            write_windows_message_line(nt_status, &self.styles, writer)?;
+            write_windows_message_line(abort_status, &self.styles, writer)?;
         }
 
         Ok(())
@@ -1393,11 +1393,11 @@ impl<'a> TestReporterImpl<'a> {
         // On Windows, also print out the exception if available.
         #[cfg(windows)]
         if let ExecutionResult::Fail {
-            abort_status: Some(AbortStatus::WindowsNtStatus(nt_status)),
+            abort_status: Some(abort_status),
             leaked: _,
         } = last_status.result
         {
-            write_windows_message_line(nt_status, &self.styles, writer)?;
+            write_windows_message_line(abort_status, &self.styles, writer)?;
         }
 
         Ok(())
@@ -2453,7 +2453,7 @@ fn status_str(result: ExecutionResult) -> Cow<'static, str> {
         },
         #[cfg(windows)]
         ExecutionResult::Fail {
-            abort_status: Some(AbortStatus::WindowsNtStatus(_)),
+            abort_status: Some(AbortStatus::WindowsNtStatus(_)) | Some(AbortStatus::JobObject),
             leaked: _,
         } => {
             // Going to print out the full error message on the following line -- just "ABORT" will
@@ -2488,7 +2488,7 @@ fn short_status_str(result: ExecutionResult) -> Cow<'static, str> {
         },
         #[cfg(windows)]
         ExecutionResult::Fail {
-            abort_status: Some(AbortStatus::WindowsNtStatus(_)),
+            abort_status: Some(AbortStatus::WindowsNtStatus(_)) | Some(AbortStatus::JobObject),
             leaked: _,
         } => {
             // Going to print out the full error message on the following line -- just "ABORT" will
@@ -2508,21 +2508,35 @@ fn short_status_str(result: ExecutionResult) -> Cow<'static, str> {
 
 #[cfg(windows)]
 fn write_windows_message_line(
-    nt_status: windows_sys::Win32::Foundation::NTSTATUS,
+    status: AbortStatus,
     styles: &Styles,
     writer: &mut dyn Write,
 ) -> io::Result<()> {
-    // Note that display_nt_status ensures that codes are aligned properly. For subsequent lines,
-    // use an indented displayer with 25 spaces (ensuring that message lines are aligned).
-    const INDENT: &str = "                       - ";
-    let mut indented = IndentWriter::new_skip_initial(INDENT, writer);
-    writeln!(
-        indented,
-        "{:>12} {}",
-        "with code".style(styles.fail),
-        crate::helpers::display_nt_status(nt_status, styles.count)
-    )?;
-    indented.flush()
+    match status {
+        AbortStatus::WindowsNtStatus(nt_status) => {
+            // Note that display_nt_status ensures that codes are aligned properly. For subsequent lines,
+            // use an indented displayer with {:>12} (ensuring that message lines are aligned).
+            const INDENT: &str = "           - ";
+            let mut indented = IndentWriter::new_skip_initial(INDENT, writer);
+            writeln!(
+                indented,
+                "{:>12} {} {}",
+                "-",
+                "with code".style(styles.fail),
+                crate::helpers::display_nt_status(nt_status, styles.count)
+            )?;
+            indented.flush()
+        }
+        AbortStatus::JobObject => {
+            writeln!(
+                writer,
+                "{:>12} {} via {}",
+                "-",
+                "terminated".style(styles.fail),
+                "job object".style(styles.count),
+            )
+        }
+    }
 }
 
 fn write_final_warnings(
@@ -3726,7 +3740,7 @@ mod tests {
 mod windows_tests {
     use super::*;
     use windows_sys::Win32::{
-        Foundation::{NTSTATUS, STATUS_CONTROL_C_EXIT, STATUS_CONTROL_STACK_VIOLATION},
+        Foundation::{STATUS_CONTROL_C_EXIT, STATUS_CONTROL_STACK_VIOLATION},
         Globalization::SetThreadUILanguage,
     };
 
@@ -3737,15 +3751,19 @@ mod windows_tests {
             SetThreadUILanguage(0x0409);
         }
 
-        insta::assert_snapshot!("ctrl_c_code", to_message_line(STATUS_CONTROL_C_EXIT));
+        insta::assert_snapshot!(
+            "ctrl_c_code",
+            to_message_line(AbortStatus::WindowsNtStatus(STATUS_CONTROL_C_EXIT))
+        );
         insta::assert_snapshot!(
             "stack_violation_code",
-            to_message_line(STATUS_CONTROL_STACK_VIOLATION),
+            to_message_line(AbortStatus::WindowsNtStatus(STATUS_CONTROL_STACK_VIOLATION)),
         );
+        insta::assert_snapshot!("job_object", to_message_line(AbortStatus::JobObject));
     }
 
     #[track_caller]
-    fn to_message_line(status: NTSTATUS) -> String {
+    fn to_message_line(status: AbortStatus) -> String {
         let mut buf = Vec::new();
         write_windows_message_line(status, &Styles::default(), &mut buf).unwrap();
         String::from_utf8(buf).unwrap()

nextest-runner/src/reporter/error_description.rs

@@ -4,6 +4,7 @@
 use super::events::{AbortStatus, ExecutionResult, UnitKind};
 use crate::{
     errors::{ChildError, ChildStartError, ErrorList},
+    helpers::display_abort_status,
     test_output::{ChildExecutionOutput, ChildOutput},
 };
 use bstr::ByteSlice;
@@ -152,26 +153,7 @@ struct UnitAbortDescription {
 
 impl fmt::Display for UnitAbortDescription {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "process aborted")?;
-        match self.status {
-            #[cfg(unix)]
-            AbortStatus::UnixSignal(sig) => {
-                let signal_str = crate::helpers::signal_str(sig)
-                    .map(|signal_str| format!("SIG{signal_str}"))
-                    .unwrap_or_else(|| sig.to_string());
-                write!(f, " with signal {signal_str}")?;
-            }
-            #[cfg(windows)]
-            AbortStatus::WindowsNtStatus(exception) => {
-                write!(
-                    f,
-                    " with code {}",
-                    // TODO: pass in bold style (probably need to not use
-                    // fmt::Display)
-                    crate::helpers::display_nt_status(exception, owo_colors::Style::new())
-                )?;
-            }
-        }
+        write!(f, "process {}", display_abort_status(self.status))?;
         if self.leaked {
             write!(f, ", and also leaked handles")?;
         }

nextest-runner/src/reporter/events.rs

@@ -741,7 +741,7 @@ pub enum ExecutionResult {
     },
     /// An error occurred while executing the test.
     ExecFail,
-    /// The test was terminated due to timeout.
+    /// The test was terminated due to a timeout.
     Timeout,
 }
 
@@ -769,6 +769,10 @@ pub enum AbortStatus {
     /// The test was determined to have aborted because the high bit was set on Windows.
     #[cfg(windows)]
     WindowsNtStatus(windows_sys::Win32::Foundation::NTSTATUS),
+
+    /// The test was terminated via job object on Windows.
+    #[cfg(windows)]
+    JobObject,
 }
 
 impl AbortStatus {

nextest-runner/src/reporter/snapshots/nextest_runner__reporter__displayer__windows_tests__ctrl_c_code.snap

@@ -1,7 +1,7 @@
 ---
 source: nextest-runner/src/reporter/displayer.rs
-expression: buf
+expression: "to_message_line(AbortStatus::WindowsNtStatus(STATUS_CONTROL_C_EXIT))"
 snapshot_kind: text
 ---
-   with code 0xc000013a: {Application Exit by CTRL+C}
-                       - The application terminated as a result of a CTRL+C. (os error 572)
+           - with code 0xc000013a: {Application Exit by CTRL+C}
+           - The application terminated as a result of a CTRL+C. (os error 572)

nextest-runner/src/reporter/snapshots/nextest_runner__reporter__displayer__windows_tests__job_object.snap

@@ -0,0 +1,6 @@
+---
+source: nextest-runner/src/reporter/displayer.rs
+expression: "to_message_line(AbortStatus::JobObject)"
+snapshot_kind: text
+---
+           - terminated via job object

nextest-runner/src/reporter/snapshots/nextest_runner__reporter__displayer__windows_tests__stack_violation_code.snap

@@ -1,6 +1,6 @@
 ---
 source: nextest-runner/src/reporter/displayer.rs
-expression: to_message_line(STATUS_CONTROL_STACK_VIOLATION)
+expression: "to_message_line(AbortStatus::WindowsNtStatus(STATUS_CONTROL_STACK_VIOLATION))"
 snapshot_kind: text
 ---
-   with code 0xc00001b2: Invalid access to memory location. (os error 998)
+           - with code 0xc00001b2: Invalid access to memory location. (os error 998)