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

Simplify the compiletest directives for ignoring coverage-test modes #131400

Merged
merged 1 commit into from
Oct 8, 2024

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Oct 8, 2024

Follow-up to #131346.

Given that these directives are now restricted to ignoring coverage-test modes only, we can drop the clunky ignore-mode-* naming convention, and just call them ignore-coverage-map and ignore-coverage-run.

r? jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Oct 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 8, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

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.

Thanks! Can you also adjust the dev-guide docs for these two directives? Should be in coverage section and also directives section.

@jieyouxu
Copy link
Member

jieyouxu commented Oct 8, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 8, 2024

📌 Commit 2758337 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 Oct 8, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2024
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#131378 (CI: rfl: move job forward to Linux v6.12-rc2)
 - rust-lang#131400 (Simplify the compiletest directives for ignoring coverage-test modes)
 - rust-lang#131408 (Remove unneeded argument of `LinkCollector::verify_disambiguator`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bb7232e into rust-lang:master Oct 8, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2024
Rollup merge of rust-lang#131400 - Zalathar:ignore-coverage, r=jieyouxu

Simplify the compiletest directives for ignoring coverage-test modes

Follow-up to rust-lang#131346.

Given that these directives are now restricted to ignoring coverage-test modes only, we can drop the clunky `ignore-mode-*` naming convention, and just call them `ignore-coverage-map` and `ignore-coverage-run`.

r? jieyouxu
@Zalathar Zalathar deleted the ignore-coverage branch October 8, 2024 23:45
@Zalathar
Copy link
Contributor Author

Zalathar commented Oct 9, 2024

Adjusted dev-guide: rust-lang/rustc-dev-guide#2094

@jieyouxu jieyouxu added the A-compiletest Area: The compiletest test runner label Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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
Development

Successfully merging this pull request may close these issues.

4 participants