Allow overwriting the output conflict handling for run tests

Author: oli-obk

src/config.rs

@@ -36,8 +36,7 @@ pub struct Config {
     /// The binary to actually execute.
     pub program: CommandBuilder,
     /// What to do in case the stdout/stderr output differs from the expected one.
-    pub output_conflict_handling:
-        fn(path: &Path, actual: Vec<u8>, errors: &mut Errors, config: &Config),
+    pub output_conflict_handling: OutputConflictHandling,
     /// The recommended command to bless failing tests.
     pub bless_command: Option<String>,
     /// Where to dump files like the binaries compiled from tests.
@@ -69,6 +68,9 @@ pub struct Config {
     pub abort_check: Arc<AtomicBool>,
 }
 
+/// Function that performs the actual output conflict handling.
+pub type OutputConflictHandling = fn(&Path, Vec<u8>, &mut Errors, &Config);
+
 impl Config {
     /// Create a blank configuration that doesn't do anything interesting
     pub fn dummy() -> Self {
@@ -200,7 +202,14 @@ impl Config {
 
         config.custom_comments.insert("run", |parser, args, span| {
             let set = |exit_code| {
-                parser.set_custom_once("run", Run { exit_code }, args.span());
+                parser.set_custom_once(
+                    "run",
+                    Run {
+                        exit_code,
+                        output_conflict_handling: None,
+                    },
+                    args.span(),
+                );
                 parser.exit_status = Spanned::new(0, span.clone()).into();
                 parser.require_annotations = Spanned::new(false, span.clone()).into();
 

src/custom_flags/run.rs

@@ -6,7 +6,7 @@ use std::{path::Path, process::Output};
 
 use crate::{
     build_manager::BuildManager, display, per_test_config::TestConfig,
-    status_emitter::RevisionStyle, CommandBuilder, Error, Errored, TestOk, TestRun,
+    status_emitter::RevisionStyle, CommandBuilder, Error, Errored, OutputConflictHandling, TestOk, TestRun,
 };
 
 use super::Flag;
@@ -16,6 +16,8 @@ use super::Flag;
 pub struct Run {
     /// The exit code that the test is expected to emit.
     pub exit_code: i32,
+    /// How to handle output conflicts
+    pub output_conflict_handling: Option<OutputConflictHandling>,
 }
 
 impl Flag for Run {
@@ -41,6 +43,9 @@ impl Flag for Run {
             aux_dir: config.aux_dir.clone(),
             status: config.status.for_revision(&revision, RevisionStyle::Show),
         };
+        if let Some(och) = self.output_conflict_handling {
+            config.config.output_conflict_handling = och;
+        }
         build_manager.add_new_job(move || {
             cmd.arg("--print").arg("file-names");
             let output = cmd.output().unwrap();