Skip to content

Commit 9287205

Browse files
authored
Merge pull request #2526 from rust-lang/rustc-pull
Rustc pull update
2 parents 16d8144 + e027c98 commit 9287205

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2b5e239c6b86cde974b0ef0f8e23754fb08ff3c5
1+
32e7a4b92b109c24e9822c862a7c74436b50e564

src/tests/directives.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,6 @@ See [Pretty-printer](compiletest.md#pretty-printer-tests).
294294

295295
- `no-auto-check-cfg` — disable auto check-cfg (only for `--check-cfg` tests)
296296
- [`revisions`](compiletest.md#revisions) — compile multiple times
297-
- [`unused-revision-names`](compiletest.md#ignoring-unused-revision-names) -
298-
suppress tidy checks for mentioning unknown revision names
299297
-[`forbid-output`](compiletest.md#incremental-tests) — incremental cfail rejects
300298
output pattern
301299
- [`should-ice`](compiletest.md#incremental-tests) — incremental cfail should
@@ -316,6 +314,17 @@ test suites that use those tools:
316314
- `llvm-cov-flags` adds extra flags when running LLVM's `llvm-cov` tool.
317315
- Used by [coverage tests](compiletest.md#coverage-tests) in `coverage-run` mode.
318316

317+
### Tidy specific directives
318+
319+
The following directives control how the [tidy script](../conventions.md#formatting)
320+
verifies tests.
321+
322+
- `ignore-tidy-target-specific-tests` disables checking that the appropriate
323+
LLVM component is required (via a `needs-llvm-components` directive) when a
324+
test is compiled for a specific target (via the `--target` flag in a
325+
`compile-flag` directive).
326+
- [`unused-revision-names`](compiletest.md#ignoring-unused-revision-names) -
327+
suppress tidy checks for mentioning unknown revision names.
319328

320329
## Substitutions
321330

0 commit comments

Comments
 (0)