Skip to content

Add exclude to config.toml #137147

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

Conversation

Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Feb 16, 2025

Closes: #35678

r? @onur-ozkan

try-job: x86_64-msvc-2

@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 Feb 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 16, 2025

This PR modifies config.example.toml.

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

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

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

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from e9a9186 to 2bf009d Compare February 16, 2025 20:06
@bors
Copy link
Collaborator

bors commented Feb 18, 2025

☔ The latest upstream changes (presumably #137176) made this pull request unmergeable. Please resolve the merge conflicts.

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from 2bf009d to 471069b Compare February 19, 2025 02:42
@onur-ozkan
Copy link
Member

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 23, 2025
@bors
Copy link
Collaborator

bors commented Feb 23, 2025

☔ The latest upstream changes (presumably #137215) made this pull request unmergeable. Please resolve the merge conflicts.

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from 471069b to daf8f8d Compare February 23, 2025 16:48
@Shourya742
Copy link
Contributor Author

@rustbot review

@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 Feb 24, 2025
@bors
Copy link
Collaborator

bors commented Feb 25, 2025

☔ The latest upstream changes (presumably #137611) made this pull request unmergeable. Please resolve the merge conflicts.

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from daf8f8d to a110552 Compare February 27, 2025 14:47
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.

LGTM

@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 1, 2025

📌 Commit a110552 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 Mar 1, 2025
@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from a110552 to 9206960 Compare March 1, 2025 07:21
@Shourya742
Copy link
Contributor Author

Shourya742 commented Mar 1, 2025

@rustbot review
cc: @onur-ozkan

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2025
@onur-ozkan
Copy link
Member

Rebase wasn't required, it was already queued.

Again, @bors r+

@bors
Copy link
Collaborator

bors commented Mar 1, 2025

📌 Commit 9206960 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2025
@Shourya742
Copy link
Contributor Author

Shourya742 commented Mar 1, 2025

Rebase wasn't required, it was already queued.

Again, @bors r+

I saw change_tracker conflicts on github, so thought of rebasing on latest changes on master. Does bors resolve merge conflicts??

@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 Mar 12, 2025
@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from d07eb8b to de54712 Compare March 12, 2025 03:04
@Shourya742
Copy link
Contributor Author

@rustbot review

@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 Mar 12, 2025
@bors
Copy link
Collaborator

bors commented Mar 13, 2025

☔ The latest upstream changes (presumably #138448) made this pull request unmergeable. Please resolve the merge conflicts.

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from de54712 to c6ecd8c Compare March 13, 2025 16:08
@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

📌 Commit c6ecd8c 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 Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2025
Rollup of 16 pull requests

Successful merges:

 - rust-lang#133055 (Expand `CloneToUninit` documentation.)
 - rust-lang#137147 (Add exclude to config.toml)
 - rust-lang#137864 (Don't drop `Rvalue::WrapUnsafeBinder` during GVN)
 - rust-lang#137890 (doc: clarify that consume can be called after BufReader::peek)
 - rust-lang#137956 (Add RTN support to rustdoc)
 - rust-lang#137968 (Properly escape regexes in Python scripts)
 - rust-lang#138082 (Remove `#[cfg(not(test))]` gates in `core`)
 - rust-lang#138275 (expose `is_s390x_feature_detected!` from `std::arch`)
 - rust-lang#138303 (Fix Ptr inconsistency in {Rc,Arc})
 - rust-lang#138309 (Add missing doc for intrinsic (Fix PR135334))
 - rust-lang#138323 (Expand and organize `offset_of!` documentation.)
 - rust-lang#138329 (debug-assert that the size_hint is well-formed in `collect`)
 - rust-lang#138465 (linkchecker: bump html5ever)
 - rust-lang#138471 (Clean up some tests in tests/ui)
 - rust-lang#138472 (Add codegen test for rust-lang#129795)
 - rust-lang#138484 (Use lit span when suggesting suffix lit cast)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b8c51f4 into rust-lang:master Mar 16, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 16, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2025
Rollup merge of rust-lang#137147 - Shourya742:2025-02-16-support-exclude-in-config.toml, r=onur-ozkan

Add exclude to config.toml

Closes: rust-lang#35678

r? `@onur-ozkan`

try-job: x86_64-msvc-2
ChangeInfo {
change_id: 137147,
severity: ChangeSeverity::Info,
summary: "New option `build.exclude` that adds support for excluding test.",
Copy link
Member

Choose a reason for hiding this comment

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

This should say "excluding tests", right?

Copy link
Member

@onur-ozkan onur-ozkan Mar 17, 2025

Choose a reason for hiding this comment

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

Also, it's not just for tests. I missed this. I will send a follow-up PR.

PR: #138592

onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Mar 17, 2025
Signed-off-by: onur-ozkan <work@onurozkan.dev>
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 17, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 17, 2025
Rollup of 9 pull requests

Successful merges:

 - rust-lang#136355 (Add `*_value` methods to proc_macro lib)
 - rust-lang#137621 (Add std support to cygwin target)
 - rust-lang#137793 (Stablize anonymous pipe)
 - rust-lang#138341 (std: Mention clone-on-write mutation in Arc<T>)
 - rust-lang#138517 (Improve upvar analysis for deref of child capture)
 - rust-lang#138584 (Update Rust Foundation links in Readme)
 - rust-lang#138586 (Document `#![register_tool]`)
 - rust-lang#138590 (Flatten and simplify some control flow 🫓)
 - rust-lang#138592 (update change entry for rust-lang#137147)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 17, 2025
Rollup merge of rust-lang#138592 - onur-ozkan:follow-up-137147, r=Kobzol

update change entry for rust-lang#137147

r? `@RalfJung`
@Shourya742 Shourya742 deleted the 2025-02-16-support-exclude-in-config.toml branch March 29, 2025 01:28
# for free to join this conversation on GitHub. Already have an account? # 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.

[rustbuild] Support exclude in config.toml, not just as a flag
6 participants