about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Macleod <alex@macleod.io>2024-02-19 14:20:11 +0000
committerAlex Macleod <alex@macleod.io>2024-02-19 14:20:11 +0000
commitf67c3f4bd88f4a35fe48e45dc4fca7e3985447f2 (patch)
tree88c26718631d6d88afa8d857116e63511bc6ac7c
parent74f611f7fc48c68924464667594dac8719a64a21 (diff)
downloadrust-f67c3f4bd88f4a35fe48e45dc4fca7e3985447f2.tar.gz
rust-f67c3f4bd88f4a35fe48e45dc4fca7e3985447f2.zip
Default test output conflict handling to error
-rw-r--r--tests/compile-test.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index 09f7badcd20..a088896b6b0 100644
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -5,7 +5,7 @@
 #![allow(unused_extern_crates)]
 
 use ui_test::spanned::Spanned;
-use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode};
+use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode, OutputConflictHandling};
 
 use std::collections::BTreeMap;
 use std::env::{self, set_var, var_os};
@@ -113,6 +113,7 @@ fn base_config(test_dir: &str) -> (Config, Args) {
 
     let target_dir = PathBuf::from(var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into()));
     let mut config = Config {
+        output_conflict_handling: OutputConflictHandling::Error,
         filter_files: env::var("TESTNAME")
             .map(|filters| filters.split(',').map(str::to_string).collect())
             .unwrap_or_default(),