Skip to content

Commit 0fabf33

Browse files
committed
Auto merge of #144673 - Zalathar:rollup-0kpeq3n, r=Zalathar
Rollup of 6 pull requests Successful merges: - rust-lang/rust#144042 (Verify llvm-needs-components are not empty and match the --target value) - rust-lang/rust#144268 (Add method `find_ancestor_not_from_macro` and `find_ancestor_not_from_extern_macro` to supersede `find_oldest_ancestor_in_same_ctxt`) - rust-lang/rust#144411 (Remove `hello_world` directory) - rust-lang/rust#144662 (compiletest: Move directive names back into a separate file) - rust-lang/rust#144666 (Make sure to account for the right item universal regions in borrowck) - rust-lang/rust#144668 ([test][run-make] add needs-llvm-components) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a39cfcc + 420077d commit 0fabf33

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/tests/directives.md

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

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

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

319328
## Substitutions
320329

0 commit comments

Comments
 (0)