Skip to content

Commit

Permalink
Rollup merge of #136112 - fmease:clean-up-all-dead-files-in-ui-tests,…
Browse files Browse the repository at this point in the history
… r=compiler-errors

Clean up all dead files inside `tests/ui/`

While rebasing #135860 I noticed that there are several dead `*.stderr` files inside `tests/ui/`.

When I checked thoroughly, I found 69 dead `*.$revision.stderr` files, 3 other dead `*.stderr` files and one dead `*.rs` file.

Prior to #134808, compiletest's `--bless` didn't remove dead `*.stderr` files when the set of revisions changed in any way (renamings, removals, additions, …) which explains their existence.

Regarding the dead `*.rs` file, that one was located inside an `auxiliary/` directory (together with a `*.stderr` file) despite not being meant to be an auxiliary file (it's not referenced by any `//@ aux-*`, it has an accompanying `*.stderr` file and it's obvious from looking at #111056 which added it). Ideally compiletest or tidy would forbid `*.std{out,err}` files inside `auxiliary/` dirs, that would've caught it. I moved it, updated it and turned it into a proper UI test.

---

How to reproduce:

1. Run `rm tests/ui/**/*.stderr`
2. Run `./x test tests/ui --bless` (or similar)
3. Manually / semi-automatically go through all tests that were ignored (likely due to your OS etc. not matching) and restore any stderr files that were overzealously removed

---

r? compiler
  • Loading branch information
GuillaumeGomez authored Jan 27, 2025
2 parents f29979a + c38951b commit f4a5cbd
Show file tree
Hide file tree
Showing 76 changed files with 45 additions and 3,628 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/issues.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,6 @@ ui/issue-18502.rs
ui/issue-24106.rs
ui/issue-76387-llvm-miscompile.rs
ui/issues-71798.rs
ui/issues/auxiliary/issue-111011.rs
ui/issues/auxiliary/issue-11224.rs
ui/issues/auxiliary/issue-11508.rs
ui/issues/auxiliary/issue-11529.rs
Expand Down
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 @@ -17,7 +17,7 @@ use ignore::Walk;
const ENTRY_LIMIT: u32 = 901;
// FIXME: The following limits should be reduced eventually.

const ISSUES_ENTRY_LIMIT: u32 = 1662;
const ISSUES_ENTRY_LIMIT: u32 = 1658;

const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
"rs", // test source files
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions tests/ui/cfg/disallowed-cli-cfgs.test_.stderr

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr

This file was deleted.

9 changes: 0 additions & 9 deletions tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr

This file was deleted.

23 changes: 0 additions & 23 deletions tests/ui/consts/write_to_mut_ref_dest.stock.stderr

This file was deleted.

12 changes: 0 additions & 12 deletions tests/ui/coroutine/coroutine-region-requirements.migrate.stderr

This file was deleted.

52 changes: 0 additions & 52 deletions tests/ui/generic-associated-types/gat-in-trait-path.base.stderr

This file was deleted.

19 changes: 0 additions & 19 deletions tests/ui/generic-associated-types/issue-67510-pass.base.stderr

This file was deleted.

57 changes: 0 additions & 57 deletions tests/ui/generic-associated-types/issue-76535.base.stderr

This file was deleted.

19 changes: 0 additions & 19 deletions tests/ui/generic-associated-types/issue-76535.extended.stderr

This file was deleted.

36 changes: 0 additions & 36 deletions tests/ui/generic-associated-types/issue-78671.base.stderr

This file was deleted.

19 changes: 0 additions & 19 deletions tests/ui/generic-associated-types/issue-78671.extended.stderr

This file was deleted.

Loading

0 comments on commit f4a5cbd

Please sign in to comment.