diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-11-05 21:12:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 21:12:28 +0100 |
| commit | cd24ffb266c84ec195c10a76f0889edb84adf4a2 (patch) | |
| tree | c55972a32a1e343797233b63fafa89710112ac0f | |
| parent | d6f12f76308c75d658df3fcc920a95c6ca87fb35 (diff) | |
| parent | 8c56ef0878bb798dba3fa7374a387b61365849ed (diff) | |
| download | rust-cd24ffb266c84ec195c10a76f0889edb84adf4a2.tar.gz rust-cd24ffb266c84ec195c10a76f0889edb84adf4a2.zip | |
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
| -rw-r--r-- | src/test/ui/extern/extern-methods.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/extern/extern-thiscall.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/extern/extern-vectorcall.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header/tests.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/extern/extern-methods.rs b/src/test/ui/extern/extern-methods.rs index 3909b5301ad..22792c11366 100644 --- a/src/test/ui/extern/extern-methods.rs +++ b/src/test/ui/extern/extern-methods.rs @@ -1,5 +1,5 @@ // run-pass -// only-i686 +// only-x86 trait A { extern "fastcall" fn test1(i: i32); diff --git a/src/test/ui/extern/extern-thiscall.rs b/src/test/ui/extern/extern-thiscall.rs index 8ce94aa71aa..717df57ec48 100644 --- a/src/test/ui/extern/extern-thiscall.rs +++ b/src/test/ui/extern/extern-thiscall.rs @@ -1,5 +1,5 @@ // run-pass -// only-i686 +// only-x86 #![feature(abi_thiscall)] diff --git a/src/test/ui/extern/extern-vectorcall.rs b/src/test/ui/extern/extern-vectorcall.rs index f625eb0890f..a283573c9fb 100644 --- a/src/test/ui/extern/extern-vectorcall.rs +++ b/src/test/ui/extern/extern-vectorcall.rs @@ -1,7 +1,7 @@ // run-pass // revisions: x64 x32 // [x64]only-x86_64 -// [x32]only-i686 +// [x32]only-x86 #![feature(abi_vectorcall)] diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs index 2485dbadab5..157b42e2d17 100644 --- a/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs @@ -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")); |