validate `--skip` and `--exclude` paths #134209

onur-ozkan · 2024-12-12T12:40:25Z

rustbot · 2024-12-12T12:40:35Z

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 · 2024-12-12T12:40:37Z

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

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

src/bootstrap/src/core/config/config.rs

rustbot · 2024-12-12T13:56:00Z

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

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

jieyouxu

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

jieyouxu · 2024-12-12T18:27:22Z

Let me double-check on msys2.

jieyouxu · 2024-12-12T18:43:39Z

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 · 2024-12-12T18:43:56Z

Thanks for the fix!
@bors r+ rollup

bors · 2024-12-12T18:43:59Z

📌 Commit 724052f has been approved by jieyouxu

It is now in the queue for this repository.

…youxu validate `--skip` and `--exclude` paths Fixes rust-lang#134198 cc `@ChrisDenton`

…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

…youxu validate `--skip` and `--exclude` paths Fixes rust-lang#134198 cc ``@ChrisDenton``

…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

compiler-errors · 2024-12-13T04:12:19Z

@bors r-

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

onur-ozkan · 2024-12-13T07:06:08Z

@rustbot ready

onur-ozkan · 2024-12-13T08:35:09Z

@bors r=jieyouxu

bors · 2024-12-13T08:35:12Z

📌 Commit 65a609b has been approved by jieyouxu

It is now in the queue for this repository.

jieyouxu · 2024-12-13T09:28:14Z

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-

src/bootstrap/src/core/config/config.rs

jieyouxu · 2024-12-13T10:41:22Z

@bors r+ rollup

bors · 2024-12-13T10:41:25Z

📌 Commit 65a609b has been approved by jieyouxu

It is now in the queue for this repository.

…youxu validate `--skip` and `--exclude` paths Fixes rust-lang#134198 cc `@ChrisDenton`

…youxu validate `--skip` and `--exclude` paths Fixes rust-lang#134198 cc ```@ChrisDenton```

…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

Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jieyouxu validate `--skip` and `--exclude` paths Fixes rust-lang#134198 cc ``@ChrisDenton``

…s, r=jieyouxu" Unfortunately, the preset logic is not quite right because `Step`s are allowed to register arbitrary *aliases* (e.g. `library/test` is aliases to `test`), which means that we incorrectly warn on ``` ./x test test ``` even though this alias is indeed a known and handled filter. A proper fix will need to do something like "collect all eligible `Step`s then check `should_run(exclude)`" in order to determine if the exclude filter will trigger for the steps. (Courtesy of jyn pointing this out.) This reverts commit 6cf13b0, reversing changes made to 2846699.

…s, r=jieyouxu" Unfortunately, the preset logic is not quite right because `Step`s are allowed to register arbitrary *aliases* (e.g. `library/test` is aliases to `test`), which means that we incorrectly warn on ``` ./x test --exclude test ``` producing ``` WARNING: '/home/joe/repos/rust/test' does not exist. ``` even though this alias (`test`) is indeed a known and handled `--exclude` filter. A proper fix will need to do something like "collect all eligible `Step`s then check `should_run(exclude)`" in order to determine if the exclude filter will trigger for the steps. (Courtesy of jyn pointing this out.) This reverts commit 6cf13b0, reversing changes made to 2846699.

…s, r=jieyouxu" Unfortunately, the present logic is not quite right because `Step`s are allowed to register arbitrary *aliases* (e.g. `library/test` is aliases to `test`), which means that we incorrectly warn on ``` ./x test --exclude test ``` producing ``` WARNING: '/home/joe/repos/rust/test' does not exist. ``` even though this alias (`test`) is indeed a known and handled `--exclude` filter. A proper fix will need to do something like "collect all eligible `Step`s then check `should_run(exclude)`" in order to determine if the exclude filter will trigger for the steps. (Courtesy of jyn pointing this out.) This reverts commit 6cf13b0, reversing changes made to 2846699.

rustbot assigned jieyouxu Dec 12, 2024

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

jieyouxu reviewed Dec 12, 2024

View reviewed changes

src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved

jieyouxu reviewed Dec 12, 2024

View reviewed changes

src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved

ChrisDenton reviewed Dec 12, 2024

View reviewed changes

src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved

onur-ozkan force-pushed the check-skip-paths branch from 0c21a28 to d52c5a6 Compare December 12, 2024 13:55

onur-ozkan force-pushed the check-skip-paths branch 2 times, most recently from 2421826 to 724052f Compare December 12, 2024 15:58

jieyouxu approved these changes Dec 12, 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 12, 2024

jieyouxu mentioned this pull request Dec 12, 2024

bootstrap/compiletest: msys2 msys --skip filter behaves strangely #134226

Open

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 12, 2024

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 mentioned this pull request Dec 12, 2024

Rollup of 7 pull requests #134235

Closed

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Dec 13, 2024

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 mentioned this pull request Dec 13, 2024

Rollup of 10 pull requests #134239

Closed

Zalathar mentioned this pull request Dec 13, 2024

coverage: Tidy up creation of covmap and covfun records #134208

Merged

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

onur-ozkan force-pushed the check-skip-paths branch from 724052f to 65a609b Compare December 13, 2024 07:05

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

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

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 reviewed Dec 13, 2024

View reviewed changes

src/bootstrap/src/core/config/config.rs Show resolved Hide resolved

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

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

Rollup of 8 pull requests #134281

Closed

Rollup of 8 pull requests #134292

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 14, 2024

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 mentioned this pull request Dec 14, 2024

Rollup of 9 pull requests #134293

Closed

bors merged commit 6cf13b0 into rust-lang:master Dec 14, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Dec 14, 2024

onur-ozkan deleted the check-skip-paths branch December 15, 2024 20:06

jieyouxu mentioned this pull request Dec 28, 2024

Revert #134209 #134843

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

validate `--skip` and `--exclude` paths #134209

validate `--skip` and `--exclude` paths #134209

onur-ozkan commented Dec 12, 2024

rustbot commented Dec 12, 2024

rustbot commented Dec 12, 2024

rustbot commented Dec 12, 2024

jieyouxu left a comment

jieyouxu commented Dec 12, 2024

jieyouxu commented Dec 12, 2024 •

edited

Loading

jieyouxu commented Dec 12, 2024

bors commented Dec 12, 2024

compiler-errors commented Dec 13, 2024

onur-ozkan commented Dec 13, 2024

onur-ozkan commented Dec 13, 2024

bors commented Dec 13, 2024

jieyouxu commented Dec 13, 2024 •

edited

Loading

jieyouxu commented Dec 13, 2024

bors commented Dec 13, 2024

validate --skip and --exclude paths #134209

validate --skip and --exclude paths #134209

Conversation

onur-ozkan commented Dec 12, 2024

rustbot commented Dec 12, 2024

rustbot commented Dec 12, 2024

rustbot commented Dec 12, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu commented Dec 12, 2024

jieyouxu commented Dec 12, 2024 • edited Loading

jieyouxu commented Dec 12, 2024

bors commented Dec 12, 2024

compiler-errors commented Dec 13, 2024

onur-ozkan commented Dec 13, 2024

onur-ozkan commented Dec 13, 2024

bors commented Dec 13, 2024

jieyouxu commented Dec 13, 2024 • edited Loading

jieyouxu commented Dec 13, 2024

bors commented Dec 13, 2024

validate `--skip` and `--exclude` paths #134209

validate `--skip` and `--exclude` paths #134209

jieyouxu commented Dec 12, 2024 •

edited

Loading

jieyouxu commented Dec 13, 2024 •

edited

Loading