Skip to content

Commit 96b51fe

Browse files
committed
Auto merge of #148090 - jhpratt:rollup-n260hcy, r=jhpratt
Rollup of 5 pull requests Successful merges: - rust-lang/rust#147406 (Remove needs-asm-support directive in tests with explicit targets) - rust-lang/rust#148056 (refactor(rustdoc): Remove redundant langstr checks) - rust-lang/rust#148065 (compiletest: Add concrete examples for some config/test path fields) - rust-lang/rust#148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms) - rust-lang/rust#148073 (test(frontmatter): Rename tests to make coverage more obvious) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3c5e16e + 856c4f7 commit 96b51fe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/tests/directives.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ Some examples of `X` in `ignore-X` or `only-X`:
163163
The following directives will check rustc build settings and target
164164
settings:
165165

166-
- `needs-asm-support` — ignores if it is running on a target that doesn't have
167-
stable support for `asm!`
166+
- `needs-asm-support` — ignores if the **host** architecture doesn't have
167+
stable support for `asm!`. For tests that cross-compile to explicit targets
168+
via `--target`, use `needs-llvm-components` instead to ensure the appropriate
169+
backend is available.
168170
- `needs-profiler-runtime` — ignores the test if the profiler runtime was not
169171
enabled for the target
170172
(`build.profiler = true` in rustc's `bootstrap.toml`)

0 commit comments

Comments
 (0)