From: bors <bors@rust-lang.org>
Date: Fri, 22 Nov 2019 04:06:52 +0000 (+0000)
Subject: Auto merge of #66524 - ecstatic-morse:compiletest-multiple-revisions, r=Centril
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=bd816fd76f4f7a040ca7ac8ca5bc556d761f96fa;hp=-c;p=rust.git

Auto merge of #66524 - ecstatic-morse:compiletest-multiple-revisions, 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
---

bd816fd76f4f7a040ca7ac8ca5bc556d761f96fa