squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #90569 - wesleywiser:fix_only_i686_tests, r=Mark-Simulacrum

Browse source 
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

27143a9094/src/tools/compiletest/src/util.rs (L160-L168)

and we translate `i686` to `x86` here

27143a9094/src/tools/compiletest/src/util.rs (L56)
This commit is contained in:
Matthias Krüger 2021-11-05 21:12:28 +01:00 committed by GitHub
commit cd24ffb266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/extern/extern-methods.rs vendored
View file

@ -1,5 +1,5 @@
// run-pass
// only-i686
// only-x86
trait A {
extern "fastcall" fn test1(i: i32);

2
src/test/ui/extern/extern-thiscall.rs vendored
View file

@ -1,5 +1,5 @@
// run-pass
// only-i686
// only-x86
#![feature(abi_thiscall)]

2
src/test/ui/extern/extern-vectorcall.rs vendored
View file

@ -1,7 +1,7 @@
// run-pass
// revisions: x64 x32
// [x64]only-x86_64
// [x32]only-i686
// [x32]only-x86
#![feature(abi_vectorcall)]

2
src/tools/compiletest/src/header/tests.rs
View file

@ -168,7 +168,7 @@ fn only_target() {
let mut config = config();
config.target = "x86_64-pc-windows-gnu".to_owned();
assert!(check_ignore(&config, "// only-i686"));
assert!(check_ignore(&config, "// only-x86"));
assert!(check_ignore(&config, "// only-linux"));
assert!(check_ignore(&config, "// only-msvc"));
assert!(check_ignore(&config, "// only-32bit"));