Skip to content

Rename incremental cfail/cpass revisions to bfail/bpass#155474

Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
Zalathar:bpass
Apr 20, 2026
Merged

Rename incremental cfail/cpass revisions to bfail/bpass#155474
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
Zalathar:bpass

Conversation

@Zalathar
Copy link
Copy Markdown
Member

Long ago, UI tests were divided into compile and run tests. Later, the compile tests were further subdivided into check and build tests, to speed up tests that don't need a full build.

The same split was never applied to incremental test revisions, so the only way to perform a check build in incremental tests is (confusingly) to use a cfail revision and then specify //@ check-fail or //@ check-pass.

This PR makes room for dedicated check-fail and check-pass revisions by renaming the existing cfail and cpass revisions to bfail and bpass, since they currently perform a full build.


The test updates were done with a regex whole-word find-and-replace for c(fail|pass)(\d*), and I also took the opportunity to manually add a space after revisions: on affected lines.

r? jieyouxu

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 18, 2026

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @tshepang

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 18, 2026
@Zalathar
Copy link
Copy Markdown
Member Author

Some of these revisions will be renamed back to cfail/cpass when I later add support for check revisions. But I think it's easier to do this migration in one big batch now, and then migrate back on a per-test basis.

Comment thread src/doc/rustc-dev-guide/src/tests/compiletest.md
@rust-log-analyzer

This comment has been minimized.

Long ago, UI tests were divided into "compile" and "run" tests. Later, the
compile tests were further subdivided into "check" and "build" tests, to speed
up tests that don't need a full build.

The same split was never applied to incremental test revisions, so the only way
to perform a check build in incremental tests is (confusingly) to use a `cfail`
revision and then specify `//@ check-fail` or `//@ check-pass`.

This PR makes room for dedicated check-fail and check-pass revisions by
renaming the existing `cfail` and `cpass` revisions to `bfail` and `bpass`,
since they currently perform a full build.
Copy link
Copy Markdown
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.

  • Checked out locally then rebased against lastest main as of time of review, I don't see any new cfail/cpass or missed ones.
  • The test diffs look right to me.

@bors r+ rollup

View changes since this review

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 20, 2026

📌 Commit 72abf37 has been approved by jieyouxu

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 20, 2026
@jieyouxu
Copy link
Copy Markdown
Member

rollup=never p=1 if needed, but IME incremental tests are not changed as often as UI tests, so I don't anticipate needing that.

jhpratt added a commit to jhpratt/rust that referenced this pull request Apr 20, 2026
Rename incremental `cfail`/`cpass` revisions to `bfail`/`bpass`

Long ago, UI tests were divided into *compile* and *run* tests. Later, the compile tests were further subdivided into *check* and *build* tests, to speed up tests that don't need a full build.

The same split was never applied to incremental test revisions, so the only way to perform a check build in incremental tests is (confusingly) to use a `cfail` revision and then specify `//@ check-fail` or `//@ check-pass`.

This PR makes room for dedicated check-fail and check-pass revisions by renaming the existing `cfail` and `cpass` revisions to `bfail` and `bpass`, since they currently perform a full build.

---

The test updates were done with a regex whole-word find-and-replace for `c(fail|pass)(\d*)`, and I also took the opportunity to manually add a space after `revisions:` on affected lines.

r? jieyouxu
rust-bors bot pushed a commit that referenced this pull request Apr 20, 2026
Rollup of 6 pull requests

Successful merges:

 - #154654 (Move `std::io::ErrorKind` to `core::io`)
 - #155054 (constify `Index(Mut)`, `Deref(Mut)` for `Vec`)
 - #155507 (suggest expect instead of unwrap when arg provided)
 - #154664 (core/num: Implement feature `integer_cast_extras`)
 - #155474 (Rename incremental `cfail`/`cpass` revisions to `bfail`/`bpass`)
 - #155493 (docs(num): fix stale link to `mem::Alignment`)
@jieyouxu
Copy link
Copy Markdown
Member

rust-bors bot pushed a commit that referenced this pull request Apr 20, 2026
…uwer

Rollup of 10 pull requests

Successful merges:

 - #155054 (constify `Index(Mut)`, `Deref(Mut)` for `Vec`)
 - #155264 (Add autocast support for `x86amx`)
 - #155507 (suggest expect instead of unwrap when arg provided)
 - #154664 (core/num: Implement feature `integer_cast_extras`)
 - #155238 (compiletest: add a new diff for compare-out-by-lines tests.)
 - #155474 (Rename incremental `cfail`/`cpass` revisions to `bfail`/`bpass`)
 - #155493 (docs(num): fix stale link to `mem::Alignment`)
 - #155529 (Remove `AttributeLintKind` variants - part 3)
 - #155531 (Tweak `is_ascii_punctuation()` docs wording)
 - #155533 (Provide a const new for `GlobalCache`)
@rust-bors rust-bors bot merged commit fda59bf into rust-lang:main Apr 20, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 20, 2026
rust-timer added a commit that referenced this pull request Apr 20, 2026
Rollup merge of #155474 - Zalathar:bpass, r=jieyouxu

Rename incremental `cfail`/`cpass` revisions to `bfail`/`bpass`

Long ago, UI tests were divided into *compile* and *run* tests. Later, the compile tests were further subdivided into *check* and *build* tests, to speed up tests that don't need a full build.

The same split was never applied to incremental test revisions, so the only way to perform a check build in incremental tests is (confusingly) to use a `cfail` revision and then specify `//@ check-fail` or `//@ check-pass`.

This PR makes room for dedicated check-fail and check-pass revisions by renaming the existing `cfail` and `cpass` revisions to `bfail` and `bpass`, since they currently perform a full build.

---

The test updates were done with a regex whole-word find-and-replace for `c(fail|pass)(\d*)`, and I also took the opportunity to manually add a space after `revisions:` on affected lines.

r? jieyouxu
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Apr 20, 2026
…uwer

Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#155054 (constify `Index(Mut)`, `Deref(Mut)` for `Vec`)
 - rust-lang/rust#155264 (Add autocast support for `x86amx`)
 - rust-lang/rust#155507 (suggest expect instead of unwrap when arg provided)
 - rust-lang/rust#154664 (core/num: Implement feature `integer_cast_extras`)
 - rust-lang/rust#155238 (compiletest: add a new diff for compare-out-by-lines tests.)
 - rust-lang/rust#155474 (Rename incremental `cfail`/`cpass` revisions to `bfail`/`bpass`)
 - rust-lang/rust#155493 (docs(num): fix stale link to `mem::Alignment`)
 - rust-lang/rust#155529 (Remove `AttributeLintKind` variants - part 3)
 - rust-lang/rust#155531 (Tweak `is_ascii_punctuation()` docs wording)
 - rust-lang/rust#155533 (Provide a const new for `GlobalCache`)
@Zalathar Zalathar deleted the bpass branch April 20, 2026 13:14
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-rustc-dev-guide Area: rustc-dev-guide 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants