Skip to content

Bump ui_test #11427

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
Sep 1, 2023
Merged

Bump ui_test #11427

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
11d8e55
Bump ui_test to 0.18.1
oli-obk Aug 30, 2023
aeed86c
Bump ui_test to 0.20
oli-obk Aug 31, 2023
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tempfile = { version = "3.2", optional = true }
termize = "0.1"

[dev-dependencies]
ui_test = "0.17.0"
ui_test = "0.20"
tester = "0.9"
regex = "1.5"
toml = "0.7.3"
Expand Down
38 changes: 13 additions & 25 deletions tests/compile-test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,34 +114,26 @@ fn canonicalize(path: impl AsRef<Path>) -> PathBuf {
}

fn base_config(test_dir: &str) -> (Config, Args) {
let bless = var_os("RUSTC_BLESS").is_some_and(|v| v != "0") || env::args().any(|arg| arg == "--bless");

let args = Args {
filters: env::var("TESTNAME")
.map(|filters| filters.split(',').map(str::to_string).collect())
.unwrap_or_default(),
quiet: false,
check: !bless,
threads: match std::env::var_os("RUST_TEST_THREADS") {
Some(n) => n.to_str().unwrap().parse().unwrap(),
None => std::thread::available_parallelism().unwrap(),
},
skip: Vec::new(),
};
let mut args = Args::test().unwrap();
args.bless |= var_os("RUSTC_BLESS").is_some_and(|v| v != "0");

let mut config = Config {
mode: Mode::Yolo { rustfix: true },
mode: Mode::Yolo {
rustfix: ui_test::RustfixMode::Everything,
},
stderr_filters: vec![(Match::PathBackslash, b"/")],
stdout_filters: vec![],
output_conflict_handling: if bless {
OutputConflictHandling::Bless
} else {
OutputConflictHandling::Error("cargo uibless".into())
},
filter_files: env::var("TESTNAME")
.map(|filters| filters.split(',').map(str::to_string).collect())
.unwrap_or_default(),
target: None,
out_dir: canonicalize(var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into())).join("ui_test"),
..Config::rustc(Path::new("tests").join(test_dir))
};
config.with_args(&args, /* bless by default */ false);
if let OutputConflictHandling::Error(err) = &mut config.output_conflict_handling {
*err = "cargo uibless".into();
}
let current_exe_path = env::current_exe().unwrap();
let deps_path = current_exe_path.parent().unwrap();
let profile_path = deps_path.parent().unwrap();
Expand Down Expand Up @@ -184,7 +176,6 @@ fn run_ui() {

ui_test::run_tests_generic(
vec![config],
args,
ui_test::default_file_filter,
ui_test::default_per_file_config,
if quiet {
Expand All @@ -209,7 +200,6 @@ fn run_internal_tests() {

ui_test::run_tests_generic(
vec![config],
args,
ui_test::default_file_filter,
ui_test::default_per_file_config,
if quiet {
Expand Down Expand Up @@ -243,7 +233,6 @@ fn run_ui_toml() {

ui_test::run_tests_generic(
vec![config],
args,
ui_test::default_file_filter,
|config, path, _file_contents| {
config
Expand Down Expand Up @@ -302,8 +291,7 @@ fn run_ui_cargo() {

ui_test::run_tests_generic(
vec![config],
args,
|path, args, _config| path.ends_with("Cargo.toml") && ui_test::default_filter_by_arg(path, args),
|path, config| path.ends_with("Cargo.toml") && ui_test::default_any_file_filter(path, config),
|config, path, _file_contents| {
config.out_dir = canonicalize(
std::env::current_dir()
Expand Down