Skip to content

Commit 1515ad4

Browse files
committed
Auto merge of #156561 - jieyouxu:rollup-l3kXdVY, r=jieyouxu
Rollup of 2 pull requests Successful merges: - rust-lang/rust#156450 (compiletest: Enforce that directives are consistently used with or without a colon) - rust-lang/rust#156531 (compiletest: Rename `//@ ignore-pass` to `//@ no-pass-override`)
2 parents e612bce + f89c290 commit 1515ad4

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/tests/directives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ See [Controlling pass/fail expectations](ui.md#controlling-passfail-expectations
7878
| `run-fail` | Program must exit with code `1..=127` | `ui` | N/A |
7979
| `run-crash` | Program must crash | `ui` | N/A |
8080
| `run-fail-or-crash` | Program must `run-fail` or `run-crash` | `ui` | N/A |
81-
| `ignore-pass` | Ignore `--pass` flag | `ui` | N/A |
81+
| `no-pass-override` | Ignore `--pass` flag | `ui` | N/A |
8282
| `dont-check-failure-status` | Don't check exact failure status (i.e. `1`) | `ui`, `incremental` | N/A |
8383
| `failure-status` | On failure, the compiler must exit with this status code. To expect an ICE, use `//@ failure-status: 101`. | `ui`, `incremental` | Any `u16` |
8484
| `should-fail` | Compiletest self-test | All | N/A |

src/tests/running.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ There are a few options for running tests:
202202

203203
Pass UI tests now have three modes, `check-pass`, `build-pass` and `run-pass`.
204204
When `--pass $mode` is passed, these tests will be forced to run under the given
205-
`$mode` unless the directive `//@ ignore-pass` exists in the test file.
205+
`$mode` unless the directive `//@ no-pass-override` exists in the test file.
206206
For example, you can run all the tests in `tests/ui` as `check-pass`:
207207

208208
```text

src/tests/ui.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ Using `--pass check` can run the UI
492492
test suite much faster (roughly twice as fast on my system), though obviously
493493
not exercising as much.
494494

495-
The `ignore-pass` directive can be used to ignore the `--pass` CLI flag if the
495+
The `no-pass-override` directive can be used to ignore the `--pass` CLI flag if the
496496
test won't work properly with that override.
497497

498498

0 commit comments

Comments
 (0)