mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #11427 - oli-obk:ui_test_bump, r=Alexendoo

Browse Source 
Bump ui_test

This makes `ui_test` parse `--bless` and allows a follow up change to use `Mode::Error` (instead of `Mode::Yolo`) with `RustfixMode::Everything`

changelog: none
This commit is contained in:
bors 2023-09-01 11:58:35 +00:00
commit acdffd791b
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -27,7 +27,7 @@ tempfile = { version = "3.2", optional = true }
termize = "0.1" termize = "0.1"
[dev-dependencies] [dev-dependencies]
ui_test = "0.17.0" ui_test = "0.20"
tester = "0.9" tester = "0.9"
regex = "1.5" regex = "1.5"
toml = "0.7.3" toml = "0.7.3"

38
tests/compile-test.rs
View File

@ -114,34 +114,26 @@ fn canonicalize(path: impl AsRef<Path>) -> PathBuf {
} }
fn base_config(test_dir: &str) -> (Config, Args) { 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 mut args = Args::test().unwrap();
args.bless |= var_os("RUSTC_BLESS").is_some_and(|v| v != "0");
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 config = Config { let mut config = Config {
mode: Mode::Yolo { rustfix: true }, mode: Mode::Yolo {
rustfix: ui_test::RustfixMode::Everything,
},
stderr_filters: vec![(Match::PathBackslash, b"/")], stderr_filters: vec![(Match::PathBackslash, b"/")],
stdout_filters: vec![], stdout_filters: vec![],
output_conflict_handling: if bless { filter_files: env::var("TESTNAME")
OutputConflictHandling::Bless .map(|filters| filters.split(',').map(str::to_string).collect())
} else { .unwrap_or_default(),
OutputConflictHandling::Error("cargo uibless".into())
},
target: None, target: None,
out_dir: canonicalize(var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into())).join("ui_test"), 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::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 current_exe_path = env::current_exe().unwrap();
let deps_path = current_exe_path.parent().unwrap(); let deps_path = current_exe_path.parent().unwrap();
let profile_path = deps_path.parent().unwrap(); let profile_path = deps_path.parent().unwrap();
@ -184,7 +176,6 @@ fn run_ui() {
ui_test::run_tests_generic( ui_test::run_tests_generic(
vec![config], vec![config],
args,
ui_test::default_file_filter, ui_test::default_file_filter,
ui_test::default_per_file_config, ui_test::default_per_file_config,
if quiet { if quiet {
@ -209,7 +200,6 @@ fn run_internal_tests() {
ui_test::run_tests_generic( ui_test::run_tests_generic(
vec![config], vec![config],
args,
ui_test::default_file_filter, ui_test::default_file_filter,
ui_test::default_per_file_config, ui_test::default_per_file_config,
if quiet { if quiet {
@ -243,7 +233,6 @@ fn run_ui_toml() {
ui_test::run_tests_generic( ui_test::run_tests_generic(
vec![config], vec![config],
args,
ui_test::default_file_filter, ui_test::default_file_filter,
|config, path, _file_contents| { |config, path, _file_contents| {
config config
@ -302,8 +291,7 @@ fn run_ui_cargo() {
ui_test::run_tests_generic( ui_test::run_tests_generic(
vec![config], vec![config],
args, |path, config| path.ends_with("Cargo.toml") && ui_test::default_any_file_filter(path, config),
|path, args, _config| path.ends_with("Cargo.toml") && ui_test::default_filter_by_arg(path, args),
|config, path, _file_contents| { |config, path, _file_contents| {
config.out_dir = canonicalize( config.out_dir = canonicalize(
std::env::current_dir() std::env::current_dir()