Skip to content

Commit cd24ffb

Browse files
authored
Rollup merge of #90569 - wesleywiser:fix_only_i686_tests, r=Mark-Simulacrum
Fix tests using `only-i686` to use the correct `only-x86` directive We translate `i686` to `x86` which means tests marked as `only-i686` never ran. Update those tests to use `only-x86`. We parse the `only-` architecture directive here https://github.com/rust-lang/rust/blob/27143a9094b55a00d5f440b05b0cb4233b300d33/src/tools/compiletest/src/util.rs#L160-L168 and we translate `i686` to `x86` here https://github.com/rust-lang/rust/blob/27143a9094b55a00d5f440b05b0cb4233b300d33/src/tools/compiletest/src/util.rs#L56
2 parents d6f12f7 + 8c56ef0 commit cd24ffb

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Diff for: src/test/ui/extern/extern-methods.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// run-pass
2-
// only-i686
2+
// only-x86
33

44
trait A {
55
extern "fastcall" fn test1(i: i32);

Diff for: src/test/ui/extern/extern-thiscall.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// run-pass
2-
// only-i686
2+
// only-x86
33

44
#![feature(abi_thiscall)]
55

Diff for: src/test/ui/extern/extern-vectorcall.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// run-pass
22
// revisions: x64 x32
33
// [x64]only-x86_64
4-
// [x32]only-i686
4+
// [x32]only-x86
55

66
#![feature(abi_vectorcall)]
77

Diff for: src/tools/compiletest/src/header/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ fn only_target() {
168168
let mut config = config();
169169
config.target = "x86_64-pc-windows-gnu".to_owned();
170170

171-
assert!(check_ignore(&config, "// only-i686"));
171+
assert!(check_ignore(&config, "// only-x86"));
172172
assert!(check_ignore(&config, "// only-linux"));
173173
assert!(check_ignore(&config, "// only-msvc"));
174174
assert!(check_ignore(&config, "// only-32bit"));

0 commit comments

Comments
 (0)