Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite version test run-make as an UI test #123563

Merged
merged 1 commit into from
Apr 7, 2024
Merged

Conversation

Oneirical
Copy link
Contributor

Claiming the simple version test from #121876.

Reasoning: As discussed in #123297, 10 years ago, some changes to CLI flags warranted the creation of the version test. Since it's not actually executing the compiled binary, it has no purpose being a run-make test and should instead be an UI test.

This is the exact same change as it was shown on my closed PR #123297. Changes were ready, but I did a major Git mishap while trying to fix a tidy error and messed up my branch. The details of this error are explained here.

@rustbot
Copy link
Collaborator

rustbot commented Apr 6, 2024

r? @TaKO8Ki

rustbot has assigned @TaKO8Ki.
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 rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 6, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@jieyouxu
Copy link
Member

jieyouxu commented Apr 6, 2024

r? @jieyouxu

@rustbot rustbot assigned jieyouxu and unassigned TaKO8Ki Apr 6, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Apr 6, 2024

Looks good to me. r=me after CI is green.

@rust-log-analyzer

This comment has been minimized.

tests/ui/does-nothing.rs Outdated Show resolved Hide resolved
src/tools/tidy/src/ui_tests.rs Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

fix: re-add stout ignore

restore does-nothing

fix: universal check-pass
@jieyouxu
Copy link
Member

jieyouxu commented Apr 6, 2024

Thanks for the PR!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 6, 2024

📌 Commit a9c0ffa has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119224 (Drop panic hook after running tests)
 - rust-lang#123411 (Put checks that detect UB under their own flag below debug_assertions)
 - rust-lang#123516 (Do not ICE on field access check on expr with `ty::Error`)
 - rust-lang#123522 (Stabilize const Atomic*::into_inner)
 - rust-lang#123559 (Add a debug asserts call to match_projection_projections to ensure invariant)
 - rust-lang#123563 (Rewrite `version` test run-make as an UI test)

Failed merges:

 - rust-lang#123569 (Move some tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 96dbde7 into rust-lang:master Apr 7, 2024
11 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2024
Rollup merge of rust-lang#123563 - Oneirical:version, r=jieyouxu

Rewrite `version` test run-make as an UI test

Claiming the simple `version` test from rust-lang#121876.

Reasoning: As discussed in rust-lang#123297, 10 years ago, some changes to CLI flags warranted the creation of the `version` test. Since it's not actually executing the compiled binary, it has no purpose being a `run-make` test and should instead be an UI test.

This is the exact same change as it was shown on my closed PR rust-lang#123297. Changes were ready, but I did a major Git mishap while trying to fix a tidy error and messed up my branch. The details of this error are explained [here](rust-lang#123297 (comment)).
@rustbot rustbot added this to the 1.79.0 milestone Apr 7, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 10, 2024
Clean up tests/ui by removing `does-nothing.rs`

In [a previous PR](rust-lang#123297 (comment)), it was suggested that this test be removed:

> it's testing a basic diagnostic for an unknown variable (added over a decade ago for rust-lang#154) that is already covered by probably dozens or hundreds of other tests.

It was then suggested that [opening a new PR](rust-lang#123563 (comment)) for this would be more organized.

I'm setting this as a draft, as:

1. The tests/ui directory is rather disorganized, a large quantity of tests are not even contained inside their own directories. This PR could turn into "clean up the UI tests directory", if I were to place everything into categories (for example, everything related to CLI flags could get placed in a cli directory).
2. This will have a merge conflict with rust-lang#123563 should that get merged. I trust that _this time_, I won't run into [The Incident](rust-lang#123297 (comment)) while rebasing. Edit: Yay, I did it properly!
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2024
Rollup merge of rust-lang#123568 - Oneirical:delete-tests, r=wesleywiser

Clean up tests/ui by removing `does-nothing.rs`

In [a previous PR](rust-lang#123297 (comment)), it was suggested that this test be removed:

> it's testing a basic diagnostic for an unknown variable (added over a decade ago for rust-lang#154) that is already covered by probably dozens or hundreds of other tests.

It was then suggested that [opening a new PR](rust-lang#123563 (comment)) for this would be more organized.

I'm setting this as a draft, as:

1. The tests/ui directory is rather disorganized, a large quantity of tests are not even contained inside their own directories. This PR could turn into "clean up the UI tests directory", if I were to place everything into categories (for example, everything related to CLI flags could get placed in a cli directory).
2. This will have a merge conflict with rust-lang#123563 should that get merged. I trust that _this time_, I won't run into [The Incident](rust-lang#123297 (comment)) while rebasing. Edit: Yay, I did it properly!
@Oneirical Oneirical deleted the version branch May 11, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants