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

Rollup merge of #110241 - clubby789:tidy-reduce-limit, r=albertlarsan68

Browse Source 
tidy: Issue an error when UI test limits are too high

cc #73494
Ensuring the limits are as low as they need to be will make it harder to accidentally add new tests to any large directories
This commit is contained in:
Matthias Krüger 2023-04-12 20:56:25 +02:00 committed by GitHub
commit 484416465e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tools/tidy/src/ui_tests.rs
View File

@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
// FIXME: The following limits should be reduced eventually. // FIXME: The following limits should be reduced eventually.
const ENTRY_LIMIT: usize = 885; const ENTRY_LIMIT: usize = 885;
const ROOT_ENTRY_LIMIT: usize = 881; const ROOT_ENTRY_LIMIT: usize = 880;
const ISSUES_ENTRY_LIMIT: usize = 1978; const ISSUES_ENTRY_LIMIT: usize = 1978;
fn check_entries(tests_path: &Path, bad: &mut bool) { fn check_entries(tests_path: &Path, bad: &mut bool) {
@ -22,18 +22,19 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
} }
} }
let (mut max, mut max_root, mut max_issues) = (0usize, 0usize, 0usize);
for (dir_path, count) in directories { for (dir_path, count) in directories {
// Use special values for these dirs. // Use special values for these dirs.
let is_root = tests_path.join("ui") == dir_path; let is_root = tests_path.join("ui") == dir_path;
let is_issues_dir = tests_path.join("ui/issues") == dir_path; let is_issues_dir = tests_path.join("ui/issues") == dir_path;
let limit = if is_root { let (limit, maxcnt) = if is_root {
ROOT_ENTRY_LIMIT (ROOT_ENTRY_LIMIT, &mut max_root)
} else if is_issues_dir { } else if is_issues_dir {
ISSUES_ENTRY_LIMIT (ISSUES_ENTRY_LIMIT, &mut max_issues)
} else { } else {
ENTRY_LIMIT (ENTRY_LIMIT, &mut max)
}; };
*maxcnt = (*maxcnt).max(count);
if count > limit { if count > limit {
tidy_error!( tidy_error!(
bad, bad,
@ -45,6 +46,21 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
); );
} }
} }
if ENTRY_LIMIT > max {
tidy_error!(bad, "`ENTRY_LIMIT` is too high (is {ENTRY_LIMIT}, should be {max})");
}
if ROOT_ENTRY_LIMIT > max_root {
tidy_error!(
bad,
"`ROOT_ENTRY_LIMIT` is too high (is {ROOT_ENTRY_LIMIT}, should be {max_root})"
);
}
if ISSUES_ENTRY_LIMIT > max_issues {
tidy_error!(
bad,
"`ISSUES_ENTRY_LIMIT` is too high (is {ISSUES_ENTRY_LIMIT}, should be {max_issues})"
);
}
} }
pub fn check(path: &Path, bad: &mut bool) { pub fn check(path: &Path, bad: &mut bool) {