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

Auto merge of #11221 - Alexendoo:ui-test-text, r=flip1995

Browse Source 
Remove Gha status emitter in compile-test

Disables the github specific output for now since it can be a bit confusing - https://github.com/oli-obk/ui_test/issues/109, in particular the truncation/repetition

r? `@flip1995`

changelog: none
This commit is contained in:
bors 2023-07-25 08:29:27 +00:00
commit d09c8a9387
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/utils/mod.rs
View File

@ -18,7 +18,7 @@ const BOOK_CONFIGS_PATH: &str = "https://doc.rust-lang.org/clippy/lint_configura
// ================================================================== // ==================================================================
// Configuration // Configuration
// ================================================================== // ==================================================================
#[derive(Debug, Clone, Default)] //~ ERROR no such field #[derive(Debug, Clone, Default)]
pub struct ClippyConfiguration { pub struct ClippyConfiguration {
pub name: String, pub name: String,
#[allow(dead_code)] #[allow(dead_code)]

36
tests/compile-test.rs
View File

@ -5,7 +5,7 @@
#![warn(rust_2018_idioms, unused_lifetimes)] #![warn(rust_2018_idioms, unused_lifetimes)]
#![allow(unused_extern_crates)] #![allow(unused_extern_crates)]
use compiletest::{status_emitter, CommandBuilder}; use compiletest::{status_emitter, CommandBuilder, OutputConflictHandling};
use ui_test as compiletest; use ui_test as compiletest;
use ui_test::Mode as TestMode; use ui_test::Mode as TestMode;
@ -116,9 +116,9 @@ fn base_config(test_dir: &str) -> compiletest::Config {
stderr_filters: vec![], stderr_filters: vec![],
stdout_filters: vec![], stdout_filters: vec![],
output_conflict_handling: if var_os("BLESS").is_some() || env::args().any(|arg| arg == "--bless") { output_conflict_handling: if var_os("BLESS").is_some() || env::args().any(|arg| arg == "--bless") {
compiletest::OutputConflictHandling::Bless OutputConflictHandling::Bless
} else { } else {
compiletest::OutputConflictHandling::Error("cargo test -- -- --bless".into()) OutputConflictHandling::Error("cargo uibless".into())
}, },
target: None, target: None,
out_dir: PathBuf::from(std::env::var_os("CARGO_TARGET_DIR").unwrap_or("target".into())).join("ui_test"), out_dir: PathBuf::from(std::env::var_os("CARGO_TARGET_DIR").unwrap_or("target".into())).join("ui_test"),
@ -187,9 +187,6 @@ fn run_ui() {
.to_string() .to_string()
}), }),
); );
eprintln!(" Compiler: {}", config.program.display());
let name = config.root_dir.display().to_string();
let test_filter = test_filter(); let test_filter = test_filter();
@ -197,7 +194,7 @@ fn run_ui() {
config, config,
move |path| compiletest::default_file_filter(path) && test_filter(path), move |path| compiletest::default_file_filter(path) && test_filter(path),
compiletest::default_per_file_config, compiletest::default_per_file_config,
(status_emitter::Text, status_emitter::Gha::<true> { name }), status_emitter::Text,
) )
.unwrap(); .unwrap();
check_rustfix_coverage(); check_rustfix_coverage();
@ -208,8 +205,19 @@ fn run_internal_tests() {
if !RUN_INTERNAL_TESTS { if !RUN_INTERNAL_TESTS {
return; return;
} }
let config = base_config("ui-internal"); let mut config = base_config("ui-internal");
compiletest::run_tests(config).unwrap(); if let OutputConflictHandling::Error(err) = &mut config.output_conflict_handling {
*err = "cargo uitest --features internal -- -- --bless".into();
}
let test_filter = test_filter();
compiletest::run_tests_generic(
config,
move |path| compiletest::default_file_filter(path) && test_filter(path),
compiletest::default_per_file_config,
status_emitter::Text,
)
.unwrap();
} }
fn run_ui_toml() { fn run_ui_toml() {
@ -228,13 +236,11 @@ fn run_ui_toml() {
"$$DIR", "$$DIR",
); );
let name = config.root_dir.display().to_string();
let test_filter = test_filter(); let test_filter = test_filter();
ui_test::run_tests_generic( ui_test::run_tests_generic(
config, config,
|path| test_filter(path) && path.extension() == Some("rs".as_ref()), |path| compiletest::default_file_filter(path) && test_filter(path),
|config, path| { |config, path| {
let mut config = config.clone(); let mut config = config.clone();
config config
@ -243,7 +249,7 @@ fn run_ui_toml() {
.push(("CLIPPY_CONF_DIR".into(), Some(path.parent().unwrap().into()))); .push(("CLIPPY_CONF_DIR".into(), Some(path.parent().unwrap().into())));
Some(config) Some(config)
}, },
(status_emitter::Text, status_emitter::Gha::<true> { name }), status_emitter::Text,
) )
.unwrap(); .unwrap();
} }
@ -284,8 +290,6 @@ fn run_ui_cargo() {
"$$DIR", "$$DIR",
); );
let name = config.root_dir.display().to_string();
let test_filter = test_filter(); let test_filter = test_filter();
ui_test::run_tests_generic( ui_test::run_tests_generic(
@ -296,7 +300,7 @@ fn run_ui_cargo() {
config.out_dir = PathBuf::from("target/ui_test_cargo/").join(path.parent().unwrap()); config.out_dir = PathBuf::from("target/ui_test_cargo/").join(path.parent().unwrap());
Some(config) Some(config)
}, },
(status_emitter::Text, status_emitter::Gha::<true> { name }), status_emitter::Text,
) )
.unwrap(); .unwrap();
} }