Skip to content

Commit 9026607

Browse files
authored
Rollup merge of #148969 - Zalathar:wasm32-uwu, r=jieyouxu
compiletest: Don't apply "emscripten" directives to `wasm32-unknown-unknown` This special case dates all the way back to the original introduction of the `wasm32-unknown-unknown` target, in rust-lang/rust#45905. Either it isn't needed, in which case we should remove it, or it *is* needed, in which case we should fix the directives in any affected tests. Note that while the intent of this code was presumably to make `//@ ignore-emscripten` also ignore tests on w32-u-u, it has the unfortunate side-effect of also causing `//@ only-emscripten` tests to *run* on w32-u-u, which is potentially very confusing.
2 parents 35cf297 + 59ca0a7 commit 9026607

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/tests/directives.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ Some examples of `X` in `ignore-X` or `only-X`:
141141
- OS: `android`, `emscripten`, `freebsd`, `ios`, `linux`, `macos`, `windows`,
142142
...
143143
- Environment (fourth word of the target triple): `gnu`, `msvc`, `musl`
144-
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`. `emscripten` also
145-
matches that target as well as the emscripten targets.
144+
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`.
146145
- Pointer width: `32bit`, `64bit`
147146
- Endianness: `endian-big`
148147
- Stage: `stage1`, `stage2`

0 commit comments

Comments
 (0)