Skip to content

Commit

Permalink
Rollup merge of rust-lang#87600 - JohnTitor:classify-ui-tests, r=petr…
Browse files Browse the repository at this point in the history
…ochenkov

Move some UI tests to more suitable subdirs

The classifui result: https://gist.github.com/JohnTitor/c9e00840990b5e4a8fc562ec3571e427/e06c42226c6038da91e403c33b9947843420cf44

Some notes:
- backtrace-debuginfo.rs: previously I skipped this, I'm still not sure what the best dir is. Any ideas?
- estr-subtyping.rs: Seems a quite old test so removed, shouldn't?
- deref-suggestion.rs: moved to inference as `suggestions` is not an ideal dir.
- issue-43023.rs: a bit misclassified, moved to `derives`

cc rust-lang#73494
r? `@petrochenkov`
  • Loading branch information
JohnTitor authored Aug 11, 2021
2 parents 0bb6f0c + b7b0291 commit 8ac3d7b
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 27 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 0 additions & 15 deletions src/test/ui/estr-subtyping.rs

This file was deleted.

11 changes: 0 additions & 11 deletions src/test/ui/estr-subtyping.stderr

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/tools/tidy/src/ui_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::path::Path;
const ENTRY_LIMIT: usize = 1000;
// FIXME: The following limits should be reduced eventually.
const ROOT_ENTRY_LIMIT: usize = 1345;
const ISSUES_ENTRY_LIMIT: usize = 2530;
const ISSUES_ENTRY_LIMIT: usize = 2525;

fn check_entries(path: &Path, bad: &mut bool) {
let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
Expand Down

0 comments on commit 8ac3d7b

Please sign in to comment.