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.

Sign up for GitHub

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

Jump to bottom

validate --skip and --exclude paths #134209

Merged
merged 1 commit into from
Dec 14, 2024
Merged

validate --skip and --exclude paths #134209

merged 1 commit into from
Dec 14, 2024

Conversation

onur-ozkan
Copy link
Member

@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 Dec 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2024

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

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

@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2024

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

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

@onur-ozkan onur-ozkan force-pushed the check-skip-paths branch 2 times, most recently from 2421826 to 724052f Compare December 12, 2024 15:58
jieyouxu
jieyouxu approved these changes Dec 12, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

I did some local testing and this seems to work. Thanks!

@jieyouxu
Copy link
Member

Let me double-check on msys2.

@jieyouxu
Copy link
Member

jieyouxu commented Dec 12, 2024 •
edited
Loading

As I suspected (unfortunately), inside MSYS2 MSYS, the --skip on the exact path does not work (I suspect this is a compiletest problem, not bootstrap). However, MSYS2 MSYS also has several other ./x test-related issues, so this is not worth blocking on MSYS2 problems IMO.

$ ./x test tests/ui/traits/fn-pointer/bare-fn-no-impl-fn-ptr-99875.rs --stage 1 --skip tests/ui/traits/fn-pointer/bare-fn-no-impl-fn-ptr-99875.rs

running 1 tests
.

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 18066 filtered out; finished in 97.23ms

EDIT: opened #134226 to track.

@jieyouxu
Copy link
Member

Thanks for the fix!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 12, 2024

📌 Commit 724052f 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 Dec 12, 2024
@jieyouxu jieyouxu mentioned this pull request Dec 12, 2024
Open
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 12, 2024
@matthiaskrgr
Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jie…
5943660 
…youxu

validate `--skip` and `--exclude` paths

Fixes rust-lang#134198

cc `@ChrisDenton`
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 12, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 13, 2024
@bors
Auto merge of rust-lang#134235 - matthiaskrgr:rollup-1reuhwq, r=matth…
04df802 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#130060 (Autodiff Upstreaming - rustc_codegen_llvm changes)
 - rust-lang#132038 (Add lint rule for `#[deprecated]` on re-exports)
 - rust-lang#133937 (Keep track of parse errors in `mod`s and don't emit resolve errors for paths involving them)
 - rust-lang#133942 (Clarify how to use `black_box()`)
 - rust-lang#134081 (Try to evaluate constants in legacy mangling)
 - rust-lang#134192 (Remove `Lexer`'s dependency on `Parser`.)
 - rust-lang#134209 (validate `--skip` and `--exclude` paths)

Failed merges:

 - rust-lang#133099 (forbid toggling x87 and fpregs on hard-float targets)

r? `@ghost`
`@rustbot` modify labels: rollup
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Dec 13, 2024
@compiler-errors
Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jie…
e80c4f8 
…youxu

validate `--skip` and `--exclude` paths

Fixes rust-lang#134198

cc ``@ChrisDenton``
@compiler-errors compiler-errors mentioned this pull request Dec 13, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 13, 2024
@bors
Auto merge of rust-lang#134239 - compiler-errors:rollup-j5r5ey7, r=co…
b95001c 
…mpiler-errors

Rollup of 10 pull requests

Successful merges:

 - rust-lang#130060 (Autodiff Upstreaming - rustc_codegen_llvm changes)
 - rust-lang#132150 (Fix powerpc64 big-endian FreeBSD ABI)
 - rust-lang#133942 (Clarify how to use `black_box()`)
 - rust-lang#134081 (Try to evaluate constants in legacy mangling)
 - rust-lang#134192 (Remove `Lexer`'s dependency on `Parser`.)
 - rust-lang#134208 (coverage: Tidy up creation of covmap and covfun records)
 - rust-lang#134209 (validate `--skip` and `--exclude` paths)
 - rust-lang#134211 (On Neutrino QNX, reduce the need to set archiver via environment variables)
 - rust-lang#134227 (Update wasi-sdk used to build WASI targets)
 - rust-lang#134229 (Fix typos in docs on provenance)

r? `@ghost`
`@rustbot` modify labels: rollup
@Zalathar Zalathar mentioned this pull request Dec 13, 2024
Merged
@compiler-errors
Copy link
Member

@bors r-

#134239 (comment). @Zalathar suggests that this is the reason for the rollup failure, per error message

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 13, 2024
@Zalathar
Copy link
Contributor

I tried this on master:

x test coverage --skip=coverage-map --skip=coverage-run

As I expected, no tests ran. So it looks like --skip is able to handle skipping test steps via an alias that doesn't correspond to any actual path, and this PR probably needs to take that into account when validating.

@onur-ozkan
Copy link
Member Author

Hmm. Seems like we should just give a friendly warning instead of panicking.

@matthiaskrgr
Copy link
Member

also failed in #134235

@onur-ozkan
validate --skip and --exclude paths
65a609b 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 13, 2024
@onur-ozkan
Copy link
Member Author

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Dec 13, 2024

📌 Commit 65a609b 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 Dec 13, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Dec 13, 2024 •
edited
Loading

Since this isn't in a rollup yet, I think there's one slight problem on the wording that can make the wording confusing.

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 13, 2024
@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 13, 2024

📌 Commit 65a609b 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 13, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 13, 2024
@matthiaskrgr
Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jie…
2691abb 
…youxu

validate `--skip` and `--exclude` paths

Fixes rust-lang#134198

cc `@ChrisDenton`
This was referenced Dec 13, 2024
Closed
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 14, 2024
@matthiaskrgr
Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jie…
9a66fb2 
…youxu

validate `--skip` and `--exclude` paths

Fixes rust-lang#134198

cc ```@ChrisDenton```
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 14, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 14, 2024
@bors
Auto merge of rust-lang#134292 - matthiaskrgr:rollup-3kbjocl, r=matth…
a1740a9 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#134181 (Tweak multispan rendering to reduce output length)
 - rust-lang#134209 (validate `--skip` and `--exclude` paths)
 - rust-lang#134231 (rustdoc-search: fix mismatched path when parent re-exported twice)
 - rust-lang#134236 (crashes: more tests v2)
 - rust-lang#134240 (Only dist `llvm-objcopy` if llvm tools are enabled)
 - rust-lang#134244 (rustc_borrowck: Stop suggesting the invalid syntax `&mut raw const`)
 - rust-lang#134251 (A bunch of cleanups (part 2))
 - rust-lang#134256 (Use a more precise span in placeholder_type_error_diag)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6cf13b0 into rust-lang:master Dec 14, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 14, 2024
@rust-timer
Unrolled build for rust-lang#134209
92d4650 
Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jieyouxu

validate `--skip` and `--exclude` paths

Fixes rust-lang#134198

cc ``@ChrisDenton``
@onur-ozkan onur-ozkan deleted the check-skip-paths branch December 15, 2024 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

@jyn514 jyn514 jyn514 left review comments

@ChrisDenton ChrisDenton ChrisDenton left review comments

Assignees

@jieyouxu jieyouxu

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
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.

./x test --skip is sensitive to path separators on Windows
9 participants
@onur-ozkan @rustbot @jieyouxu @bors @compiler-errors @Zalathar @matthiaskrgr @ChrisDenton @jyn514