Support multiple revisions in compiletest
#66524
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
Centril
approved these changes
Nov 19, 2019
src/tools/compiletest/src/errors.rs
Outdated
| match line[kind_start..] | ||
|
|
||
| // Get the part of the comment after the sigil (e.g. `~^^` or ~|). | ||
| let (_, mut msg) = line.split_at(captures.get(0).unwrap().end()); |
There was a problem hiding this comment.
@BurntSushi Have you considered providing a method for the 0th-always-OK group to make things clearer and avoid the .unwrap() in client code? Would have been helpful during review.
There was a problem hiding this comment.
Haven't considered it, but it's not a bad idea! Thanks.
|
@bors r+ |
|
📌 Commit fd49547d03a0277818495f4028475d425abe4fe0 has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #66578) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
The `//[X]~` syntax filters errors for tests that are run across multiple cfgs with `// revisions:`. This commit extends that syntax to accept `//[X,Y]~`, which will match multiple cfgs to the same error annotation. This is functionally the same as writing two comments, `//[X]~` and `//[Y]~`, but can fit on a single line.
This test does not actually emit any warnings, since `#![allow(warnings)]` was specified. `compiletest` was erroneously ignoring `//~` tests and looking only for `//[X]~` ones. As a result of the changes in the previous commit, we now look for `//~` comments in incremental tests and expect them to appear in *all* revisions.
ecstatic-morse
force-pushed
the
compiletest-multiple-revisions
branch
from
fd49547 to
ae22938
Compare
|
@bors r=Centril |
|
📌 Commit c537f22 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Nov 22, 2019
… r=Centril Support multiple revisions in `compiletest` The `//[X]~` syntax filters errors for tests that are run across multiple cfgs with `// revisions:`. This commit extends that syntax to accept `//[X,Y]~`, which will match multiple cfgs to the same error annotation. This is functionally the same as writing two comments, `//[X]~` and `//[Y]~`, but can fit on a single line. While refactoring `compiletest` to support this, I also uncovered a small bug that was causing an incremental test to always pass, despite no errors being emitted. r? @Centril
|
☀️ Test successful - checks-azure |
|
📣 Toolstate changed by #66524! Tested on commit bd816fd. 💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Nov 22, 2019
Tested on commit rust-lang/rust@bd816fd. Direct link to PR: <rust-lang/rust#66524> 💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).
This was referenced Feb 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
//[X]~syntax filters errors for tests that are run across multiple cfgs with// revisions:. This commit extends that syntax to accept//[X,Y]~, which will match multiple cfgs to the same error annotation. This is functionally the same as writing two comments,//[X]~and//[Y]~, but can fit on a single line.While refactoring
compiletestto support this, I also uncovered a small bug that was causing an incremental test to always pass, despite no errors being emitted.r? @Centril