compiletest: Remove empty 'expected' files when blessing #134808

clubby789 · 2024-12-26T23:25:34Z

This also refactors compare_output to return an enum; returning a usize was done for convenience but is misleading

rustbot · 2024-12-26T23:25:42Z

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-12-26T23:25:44Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

jieyouxu

Thanks, I have some nits and a question, but otherwise LGTM.

src/tools/compiletest/src/runtest.rs

src/tools/compiletest/src/runtest/coverage.rs

src/tools/compiletest/src/runtest.rs

jieyouxu

Tiny nits, I'll do some local testing

src/tools/compiletest/src/runtest.rs

src/tools/compiletest/src/runtest/coverage.rs

clubby789 · 2024-12-27T12:02:00Z

Updated; some stuff got borked in rebasing

src/tools/compiletest/src/runtest/coverage.rs

jieyouxu

Based on local testing:

Added a new ui test w/ error anno.
- Initial no bless, failed as expected due to comparison w/ non-existent stderr failed.
- Blessed, pass as expected.
- Observed .stderr is present.
Changed test to //@ check-pass and removed error annotation.
- Observed empty .stderr is removed.

Seems like it's working as intended. Feel free to r=me after PR CI is green, thanks!

clubby789 · 2024-12-27T14:05:10Z

@bors r=jieyouxu

bors · 2024-12-27T14:05:13Z

📌 Commit 5bb727a has been approved by jieyouxu

It is now in the queue for this repository.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#133663 (Add a compiler intrinsic to back `bigint_helper_methods`) - rust-lang#134798 (Make `ty::Error` implement all auto traits) - rust-lang#134808 (compiletest: Remove empty 'expected' files when blessing) - rust-lang#134809 (Add `--no-capture`/`--nocapture` as bootstrap arguments) - rust-lang#134826 (Add spastorino to users_on_vacation) - rust-lang#134828 (Add clubby789 back to bootstrap review rotation) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#134808 - clubby789:compiletest-remove-stderr, r=jieyouxu compiletest: Remove empty 'expected' files when blessing Fixes rust-lang#134793 Fixes rust-lang#134196 This also refactors `compare_output` to return an enum; returning a usize was done for convenience but is misleading

…r, r=jieyouxu compiletest: Remove empty 'expected' files when blessing Fixes rust-lang#134793 Fixes rust-lang#134196 This also refactors `compare_output` to return an enum; returning a usize was done for convenience but is misleading

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#133663 (Add a compiler intrinsic to back `bigint_helper_methods`) - rust-lang#134798 (Make `ty::Error` implement all auto traits) - rust-lang#134808 (compiletest: Remove empty 'expected' files when blessing) - rust-lang#134809 (Add `--no-capture`/`--nocapture` as bootstrap arguments) - rust-lang#134826 (Add spastorino to users_on_vacation) - rust-lang#134828 (Add clubby789 back to bootstrap review rotation) r? `@ghost` `@rustbot` modify labels: rollup

rust-lang#134808 made --bless remove empty expected files. Remove some empty files that were causing noise in unrelated `--bless` invocations.

Remove some empty expected files to fix blessing rust-lang#134808 made --bless remove empty expected files. Remove some empty files that were causing noise in unrelated `--bless` invocations.

Rollup merge of rust-lang#135401 - joshtriplett:empty-expected, r=lqd Remove some empty expected files to fix blessing rust-lang#134808 made --bless remove empty expected files. Remove some empty files that were causing noise in unrelated `--bless` invocations.

…ui-tests, r=compiler-errors Clean up all dead files inside `tests/ui/` While rebasing rust-lang#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 rust-lang#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 rust-lang#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

Rollup merge of rust-lang#136112 - fmease:clean-up-all-dead-files-in-ui-tests, r=compiler-errors Clean up all dead files inside `tests/ui/` While rebasing rust-lang#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 rust-lang#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 rust-lang#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

rustbot assigned onur-ozkan Dec 26, 2024

jieyouxu assigned jieyouxu and unassigned onur-ozkan Dec 27, 2024

jieyouxu approved these changes Dec 27, 2024

View reviewed changes

src/tools/compiletest/src/runtest.rs Outdated Show resolved Hide resolved

src/tools/compiletest/src/runtest/coverage.rs Show resolved Hide resolved

src/tools/compiletest/src/runtest/coverage.rs Outdated Show resolved Hide resolved

src/tools/compiletest/src/runtest.rs Show resolved Hide resolved

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 27, 2024

rust-cloud-vms bot force-pushed the compiletest-remove-stderr branch 2 times, most recently from 7b35a2c to d04e480 Compare December 27, 2024 11:49

jieyouxu reviewed Dec 27, 2024

View reviewed changes

src/tools/compiletest/src/runtest.rs Outdated Show resolved Hide resolved

src/tools/compiletest/src/runtest/coverage.rs Outdated Show resolved Hide resolved

rust-cloud-vms bot force-pushed the compiletest-remove-stderr branch from d04e480 to b03d3ed Compare December 27, 2024 12:01

jieyouxu reviewed Dec 27, 2024

View reviewed changes

src/tools/compiletest/src/runtest/coverage.rs Outdated Show resolved Hide resolved

compiletest: Remove/don't write empty 'expected' files

5bb727a

rust-cloud-vms bot force-pushed the compiletest-remove-stderr branch from b03d3ed to 5bb727a Compare December 27, 2024 12:12

jieyouxu approved these changes Dec 27, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 27, 2024

matthiaskrgr mentioned this pull request Dec 27, 2024

Rollup of 6 pull requests #134830

Merged

bors merged commit 7ba9655 into rust-lang:master Dec 27, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Dec 27, 2024

joshtriplett mentioned this pull request Jan 12, 2025

Remove some empty expected files to fix blessing #135401

Merged

fmease mentioned this pull request Jan 27, 2025

Clean up all dead files inside tests/ui/ #136112

Merged

compiletest: Remove empty 'expected' files when blessing #134808

compiletest: Remove empty 'expected' files when blessing #134808

Uh oh!

Conversation

clubby789 commented Dec 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Dec 26, 2024

Uh oh!

rustbot commented Dec 26, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

clubby789 commented Dec 27, 2024

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

clubby789 commented Dec 27, 2024

Uh oh!

bors commented Dec 27, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

clubby789 commented Dec 26, 2024 •

edited

Loading