Move abort -> Errored logic into Config

Author: oli-obk

src/aux_builds.rs

@@ -141,9 +141,7 @@ impl Build for AuxBuilder {
         aux_cmd.arg("--print").arg("file-names");
         let output = run_command(&mut aux_cmd)?;
 
-        if build_manager.aborted() {
-            return Err(Errored::aborted());
-        }
+        config.aborted()?;
 
         assert!(output.status.success());
 

src/build_manager.rs

@@ -156,6 +156,6 @@ impl BuildManager {
 
     /// Whether the build was cancelled
     pub fn aborted(&self) -> bool {
-        self.config.aborted()
+        self.config.abort_check.aborted()
     }
 }

src/config.rs

@@ -8,7 +8,7 @@ use crate::{
     diagnostics::{self, Diagnostics},
     parser::CommandParserFunc,
     per_test_config::{Comments, Condition},
-    CommandBuilder, Error, Errors,
+    CommandBuilder, Error, Errored, Errors,
 };
 use color_eyre::eyre::Result;
 use regex::bytes::Regex;
@@ -454,8 +454,12 @@ impl Config {
             ^ self.run_only_ignored
     }
 
-    pub(crate) fn aborted(&self) -> bool {
-        self.abort_check.aborted()
+    pub(crate) fn aborted(&self) -> Result<(), Errored> {
+        if self.abort_check.aborted() {
+            Err(Errored::aborted())
+        } else {
+            Ok(())
+        }
     }
 }
 

src/per_test_config.rs

@@ -383,9 +383,7 @@ impl TestConfig {
         let output = crate::core::run_command(&mut cmd)?;
 
         // Do not bless aborted tests
-        if build_manager.aborted() {
-            return Err(Errored::aborted());
-        }
+        self.aborted()?;
 
         let output = self.check_test_result(&cmd, output)?;
 
@@ -412,11 +410,7 @@ impl TestConfig {
     }
 
     pub(crate) fn aborted(&self) -> Result<(), Errored> {
-        if self.config.aborted() {
-            Err(Errored::aborted())
-        } else {
-            Ok(())
-        }
+        self.config.aborted()
     }
 
     /// All the environment variables set for the given revision