Skip to content

Update ui_test requirement from 0.23.0 to 0.29.1 #18289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2025
Merged

Update ui_test requirement from 0.23.0 to 0.29.1 #18289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f54b4ff
Update ui_test requirement from 0.23.0 to 0.29.1
dependabot[bot] Mar 10, 2025
151d583
Fixes breaking changes
mnmaita Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/compile_fail_utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
ui_test = "0.23.0"
ui_test = "0.29.1"

[[test]]
name = "example"
Expand Down
9 changes: 5 additions & 4 deletions tools/compile_fail_utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ use std::{
pub use ui_test;

use ui_test::{
bless_output_files,
color_eyre::eyre::eyre,
default_file_filter, default_per_file_config,
dependencies::DependencyBuilder,
run_tests_generic,
ignore_output_conflict, run_tests_generic,
spanned::Spanned,
status_emitter::{Gha, StatusEmitter, Text},
Args, Config, OutputConflictHandling,
Args, Config,
};

/// Use this instead of hand rolling configs.
Expand Down Expand Up @@ -44,10 +45,10 @@ fn basic_config(root_dir: impl Into<PathBuf>, args: &Args) -> ui_test::Result<Co
.to_string(),
),
output_conflict_handling: if env::var_os("BLESS").is_some() {
OutputConflictHandling::Bless
bless_output_files
} else {
// stderr output changes between rust versions so we just rely on annotations
OutputConflictHandling::Ignore
ignore_output_conflict
},
..Config::rustc(root_dir)
};
Expand Down