Merge pull request #283 from oli-obk/miri

Various changes needed for miri

Author: oli-obk

CHANGELOG.md

@@ -13,8 +13,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [0.27.0] - 2024-10-07
+
+### Added
+
+* debug status emitter for when you have problems with ui_test
+* cargo features to disable gha or CLI refreshing 
+
+### Fixed
+
+* CLI refreshing is now reliable and not leaving around fragments
+* Can run multiple `Config`s that test the same files in parallel.
+
+### Changed
+
 * `only`/`ignore` filters now only accept integers, alphabetic characters, `-` and `_`
 * `only`/ `ignore` filters allow comments by ignoring everything from an `#` onwards
+* `OutputConflictHandling` has been replaced by `error_on_output_conflict`, `bless_output_files`,
+    and `ignore_output_conflict` functions. Custom functions can now be used to implement special
+    handling of output conflicts.
+* `Run` now forwards env vars passed to the compiler to the executable, too
 
 ### Removed
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.26.5"
+version = "0.27.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"
@@ -23,7 +23,7 @@ rustfix = "0.8.1"
 cargo-platform = { version = "0.1.2", optional = true }
 comma = "1.0.0"
 anyhow = "1.0.6"
-indicatif = "0.17.6"
+indicatif = { version = "0.17.6", optional = true }
 prettydiff = { version = "0.7", default-features = false }
 annotate-snippets = { version = "0.11.2" }
 levenshtein = "1.0.5"
@@ -52,5 +52,6 @@ name = "build_std"
 test = false
 
 [features]
-default = ["rustc"]
+default = ["rustc", "indicatif", "gha"]
+gha = []
 rustc = ["dep:cargo-platform", "dep:cargo_metadata"]

Cargo.toml

@@ -4,6 +4,7 @@ use std::sync::atomic::Ordering;
 use ui_test::{run_tests, Config};
 
 #[cfg(feature = "rustc")]
+#[cfg_attr(test, test)]
 fn main() -> ui_test::color_eyre::Result<()> {
     let config = Config::rustc("examples_tests/rustc_basic");
     let abort_check = config.abort_check.clone();

examples/rustc_basic.rs

@@ -0,0 +1,29 @@
+#[cfg(feature = "rustc")]
+use std::sync::atomic::Ordering;
+#[cfg(feature = "rustc")]
+use ui_test::{
+    default_file_filter, default_per_file_config, run_tests_generic, status_emitter, Config,
+};
+
+#[cfg(feature = "rustc")]
+#[cfg_attr(test, test)]
+fn main() -> ui_test::color_eyre::Result<()> {
+    let config = Config::rustc("examples_tests/rustc_basic");
+    let abort_check = config.abort_check.clone();
+    ctrlc::set_handler(move || abort_check.store(true, Ordering::Relaxed))?;
+
+    // Compile all `.rs` files in the given directory (relative to your
+    // Cargo.toml) and compare their output against the corresponding
+    // `.stderr` files.
+    run_tests_generic(
+        vec![config.clone(), config],
+        default_file_filter,
+        default_per_file_config,
+        status_emitter::Text::verbose(),
+    )
+}
+
+#[cfg(not(feature = "rustc"))]
+fn main() -> ui_test::color_eyre::Result<()> {
+    Ok(())
+}

examples/rustc_twice_with_different_flags.rs

@@ -20,12 +20,14 @@ error[E0384]: cannot assign twice to immutable variable `x`
  --> examples_tests/rustc_basic/aux_derive.rs:8:5
   |
 7 |     let x = Foo;
-  |         -
-  |         |
-  |         first assignment to `x`
-  |         help: consider making this binding mutable: `mut x`
+  |         - first assignment to `x`
 8 |     x = Foo;
   |     ^^^^^^^ cannot assign twice to immutable variable
+  |
+help: consider making this binding mutable
+  |
+7 |     let mut x = Foo;
+  |         +++
 
 error: aborting due to 1 previous error; 2 warnings emitted
 

examples_tests/rustc_basic/aux_derive.stderr

@@ -1,4 +1,5 @@
 //@run
+//@revisions: a b c d e f g h i j k l m n
 
 fn main() {
     std::thread::sleep(std::time::Duration::from_secs(5));

examples_tests/rustc_basic/executable.rs

@@ -1,4 +1,4 @@
-//@[foo] only-target-asdfasdf
+//@[foo] only-target: asdfasdf
 
 //@ revisions: foo bar
 

examples_tests/rustc_basic/filtered_out.rs

@@ -1,10 +1,6 @@
 //! Everything needed to build auxilary files with rustc
 // lol we can't name this file `aux.rs` on windows
 
-use bstr::ByteSlice;
-use spanned::Spanned;
-use std::{ffi::OsString, path::PathBuf, process::Command, sync::Arc};
-
 use crate::{
     build_manager::{Build, BuildManager},
     custom_flags::Flag,
@@ -13,6 +9,9 @@ use crate::{
     status_emitter::SilentStatus,
     CrateType, Error, Errored,
 };
+use bstr::ByteSlice;
+use spanned::Spanned;
+use std::{ffi::OsString, path::PathBuf, process::Command, sync::Arc};
 
 impl Flag for AuxBuilder {
     fn must_be_unique(&self) -> bool {

src/aux_builds.rs

@@ -1,19 +1,17 @@
 //! Auxiliary and dependency builder. Extendable to custom builds.
 
-use std::{
-    collections::{hash_map::Entry, HashMap},
-    ffi::OsString,
-    sync::{Arc, OnceLock, RwLock},
-};
-
-use color_eyre::eyre::Result;
-use crossbeam_channel::{bounded, Sender};
-
 use crate::{
     status_emitter::{RevisionStyle, TestStatus},
     test_result::TestRun,
     Config, Errored,
 };
+use color_eyre::eyre::Result;
+use crossbeam_channel::{bounded, Sender};
+use std::{
+    collections::{hash_map::Entry, HashMap},
+    ffi::OsString,
+    sync::{Arc, OnceLock, RwLock},
+};
 
 /// A build shared between all tests of the same `BuildManager`
 pub trait Build {