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

x.py test: remove no-op --skip flag #123342

Merged
merged 1 commit into from
Apr 3, 2024
Merged

x.py test: remove no-op --skip flag #123342

merged 1 commit into from
Apr 3, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Apr 1, 2024

None of the test commands seems to do anything with this flag, so we might as well remove it.

@rustbot
Copy link
Collaborator

rustbot commented Apr 1, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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 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) labels Apr 1, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 1, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@lqd
Copy link
Member

lqd commented Apr 1, 2024

I wonder if it being a no-op is a recent change, because we had to use it in opt-dist, and are still using it cc @Kobzol

@Kobzol
Copy link
Contributor

Kobzol commented Apr 2, 2024

We do use it in opt-dist, and it works. But I think that this PR removes a flag only for the test subcommand? Looks like these two flags were somehow overwriting each other, if you check the completions, the test flag is now replaced by the global skip flag.

@RalfJung
Copy link
Member Author

RalfJung commented Apr 2, 2024

Yes this removes a flag only for test. I think this was meant to model cargo test -- --skip foo? Not sure.

I did not realize there's a second --skip at the global level. Even more of a reason to remove the one in Test I think?

@Kobzol
Copy link
Contributor

Kobzol commented Apr 2, 2024

Yeah, especially since it was unused.

@Kobzol
Copy link
Contributor

Kobzol commented Apr 2, 2024

I think that x.py test -- ... (or --test-args ...?) can be still used for skipping tests, but I'm not sure.

@RalfJung
Copy link
Member Author

RalfJung commented Apr 2, 2024

Yeah it's --test-args --skip --test-args foo. Which is very awkward to type...

Would be nice if x.py test -- worked for this. :)

Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Yeah it's --test-args --skip --test-args foo. Which is very awkward to type...

Would be nice if x.py test -- worked for this. :)

test -- --skip works already. e.g., x test tests/run-make/hir-tree -- --skip tests/run-make/hir-tree results with:

Testing stage2 compiletest suite=run-make mode=run-make (x86_64-unknown-linux-gnu)

running 0 tests

@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 3, 2024

📌 Commit 5a88794 has been approved by onur-ozkan

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 3, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#123209 (Add section to sanitizer doc for `-Zexternal-clangrt`)
 - rust-lang#123342 (x.py test: remove no-op --skip flag)
 - rust-lang#123382 (Assert `FnDef` kind)
 - rust-lang#123386 (Set `CARGO` instead of `PATH` for Rust Clippy)
 - rust-lang#123393 (rustc_ast: Update `P<T>` docs to reflect mutable status.)
 - rust-lang#123394 (Postfix match fixes)
 - rust-lang#123412 (Output URLs of CI artifacts to GitHub summary)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f7c34c0 into rust-lang:master Apr 3, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2024
Rollup merge of rust-lang#123342 - RalfJung:noskip, r=onur-ozkan

x.py test: remove no-op --skip flag

None of the test commands seems to do anything with this flag, so we might as well remove it.
@RalfJung RalfJung deleted the noskip branch April 5, 2024 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants