Skip to content

Move ui if tests from top-level into expr/if #79395

New issue

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

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

Already on GitHub? # to your account

Merged
merged 3 commits into from
Nov 29, 2020
Merged

Conversation

Havvy
Copy link
Contributor

@Havvy Havvy commented Nov 25, 2020

This lowers the number of top-level files in src/test/ui from 1612 to 1604.

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 25, 2020
@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. A-testsuite Area: The testsuite used to check the correctness of rustc labels Nov 25, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+

I'm going to approve this, since you've done the work, but before you continue I think it would be good to have some broader discussion about the goals here -- in particular, I usually run either all UI tests, or a particular one -- I don't think I've ever wanted to run "if" tests only. But maybe that's more common in other kinds of compiler work? I mostly want to avoid churn and long-term needing to worry about this on every addition if there's not too much advantage.

@bors
Copy link
Collaborator

bors commented Nov 29, 2020

📌 Commit 6919a77 has been approved by Mark-Simulacrum

@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 Nov 29, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 29, 2020
Rollup of 11 pull requests

Successful merges:

 - rust-lang#79327 (Require allocator to be static for boxed `Pin`-API)
 - rust-lang#79340 (Rename "stability" CSS class to "item-info" and combine `document_stability` with `document_short`)
 - rust-lang#79363 (BTreeMap: try to enhance various comments)
 - rust-lang#79395 (Move ui if tests from top-level into `expr/if`)
 - rust-lang#79443 (Improve rustdoc JS tests error output)
 - rust-lang#79464 (Extend doc keyword feature by allowing any ident)
 - rust-lang#79484 (add enable-full-tools to freebsd builds to prevent occasional link er…)
 - rust-lang#79505 (Cleanup: shorter and faster code)
 - rust-lang#79514 (Add test for issue rust-lang#54121: order dependent trait bounds)
 - rust-lang#79516 (Remove unnecessary `mut` binding)
 - rust-lang#79528 (Fix a bootstrap comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 851def2 into rust-lang:master Nov 29, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 29, 2020
@Havvy Havvy deleted the test-move-if branch November 29, 2020 07:00
@bjorn3
Copy link
Member

bjorn3 commented Nov 29, 2020

I'm going to approve this, since you've done the work, but before you continue I think it would be good to have some broader discussion about the goals here -- in particular, I usually run either all UI tests, or a particular one -- I don't think I've ever wanted to run "if" tests only. But maybe that's more common in other kinds of compiler work? I mostly want to avoid churn and long-term needing to worry about this on every addition if there's not too much advantage.

Rustc_codegen_cranelift doesn't yet support certain features, so I remove the tests for those features. Some features have their tests in a single dir, so removing them is easy. Others have them spread out in the root dir, so I have to remove each one individually: https://github.com/bjorn3/rustc_codegen_cranelift/blob/5f60b36a715eef37d8851ca81e62f5a919b8b54e/test.sh#L102-L169

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants