Skip to content

Commit 85c4991

Browse files
authored
Rollup merge of rust-lang#110970 - est31:test_dirs_relax, r=petrochenkov
tidy: remove ENTRY_LIMIT maximum checking and set it to 900 Removes checking of `ENTRY_LIMIT` towards an actually reached maximum, and sets it to 900. The number 900 is safely below github's limit of 1000 entries for a directory. PRs to move tests can still decrease the sizes of various directories, but adjusting the limit won't be neccessary any more. In fact, such reduction PRs are a great idea so that no unrelated PR is hitting the limit: ideally there would always be a (manually maintained) safety margin between the actually reached maximum and `ENTRY_LIMIT`, for all directories. In general, the limit is a bad tool to direct people to put tests into fitting directories because when those are available, usually the limit is not hit, while the limit is hit in directories that have a weak substructure themselves. I got into this situation myself when writing rust-lang#110694: tests/ui/parser is hitting the limit, but has few directories of its own. Suggested by `@petrochenkov` in rust-lang#110694 (comment). r? `@petrochenkov`
2 parents 805825e + e498402 commit 85c4991

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/tools/tidy/src/ui_tests.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use std::collections::HashMap;
77
use std::fs;
88
use std::path::{Path, PathBuf};
99

10+
const ENTRY_LIMIT: usize = 900;
1011
// FIXME: The following limits should be reduced eventually.
11-
const ENTRY_LIMIT: usize = 885;
12-
const ROOT_ENTRY_LIMIT: usize = 894;
1312
const ISSUES_ENTRY_LIMIT: usize = 1953;
13+
const ROOT_ENTRY_LIMIT: usize = 894;
1414

1515
fn check_entries(tests_path: &Path, bad: &mut bool) {
1616
let mut directories: HashMap<PathBuf, usize> = HashMap::new();
@@ -46,9 +46,6 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
4646
);
4747
}
4848
}
49-
if ENTRY_LIMIT > max {
50-
tidy_error!(bad, "`ENTRY_LIMIT` is too high (is {ENTRY_LIMIT}, should be {max})");
51-
}
5249
if ROOT_ENTRY_LIMIT > max_root {
5350
tidy_error!(
5451
bad,

0 commit comments

Comments
 (0)