update tests to use proper error-in-other-file and use new conditions

Author: asquared31415

tests/ui-fulldeps/missing-rustc-driver-error.rs

@@ -1,5 +1,5 @@
 // Test that we get the following hint when trying to use a compiler crate without rustc_driver.
-//@error-pattern: try adding `extern crate rustc_driver;` at the top level of this crate
+//@error-in-other-file: try adding `extern crate rustc_driver;` at the top level of this crate
 //@compile-flags: --emit link
 // normalize-stderr-test ".*crate .* required.*\n\n" -> ""
 // normalize-stderr-test: "aborting due to [0-9]+" -> "aborting due to NUMBER"

tests/ui/abi/abi-sysv64-arg-passing.rs

@@ -24,10 +24,10 @@
 // issue-62350-sysv-neg-reg-counts
 // struct-return
 
-// ignore-android
-// ignore-arm
-// ignore-aarch64
-// ignore-windows
+//@ignore-target-android
+//@ignore-target-arm
+//@ignore-target-aarch64
+//@ignore-target-windows
 
 // note: windows is ignored as rust_test_helpers does not have the sysv64 abi on windows
 

tests/ui/abi/abi-sysv64-register-usage.rs

@@ -2,9 +2,9 @@
 // Checks if the correct registers are being used to pass arguments
 // when the sysv64 ABI is specified.
 
-// ignore-android
-// ignore-arm
-// ignore-aarch64
+//@ignore-target-android
+//@ignore-target-arm
+//@ignore-target-aarch64
 //@needs-asm-support
 
 #[cfg(target_arch = "x86_64")]

tests/ui/abi/anon-extern-mod.rs

@@ -1,6 +1,6 @@
 //@run
 // pretty-expanded FIXME #23616
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #![feature(rustc_private)]
 

tests/ui/abi/c-stack-as-value.rs

@@ -1,6 +1,6 @@
 //@run
 // pretty-expanded FIXME #23616
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #![feature(rustc_private)]
 

tests/ui/abi/c-stack-returning-int64.rs

@@ -1,6 +1,6 @@
 //@run
-// ignore-wasm32-bare no libc to test with
-// ignore-sgx no libc
+//@ignore-target-wasm32-unknown-unknown no libc to test with
+//@ignore-target-sgx no libc
 
 #![feature(rustc_private)]
 

tests/ui/abi/cabi-int-widening.rs

@@ -1,15 +1,13 @@
 //@run
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #[link(name = "rust_test_helpers", kind = "static")]
 extern "C" {
     fn rust_int8_to_int32(_: i8) -> i32;
 }
 
 fn main() {
-    let x = unsafe {
-        rust_int8_to_int32(-1)
-    };
+    let x = unsafe { rust_int8_to_int32(-1) };
 
     assert!(x == -1);
 }

tests/ui/abi/cross-crate/anon-extern-mod-cross-crate-2.rs

@@ -1,7 +1,7 @@
 //@run
 //@aux-build:anon-extern-mod-cross-crate-1.rs
 // pretty-expanded FIXME #23616
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 extern crate anonexternmod;
 

tests/ui/abi/cross-crate/duplicated-external-mods.rs

@@ -2,8 +2,8 @@
 //@aux-build:anon-extern-mod-cross-crate-1.rs
 //@aux-build:anon-extern-mod-cross-crate-1.rs
 // pretty-expanded FIXME #23616
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 extern crate anonexternmod;
 
-pub fn main() { }
+pub fn main() {}

tests/ui/abi/extern/extern-call-deep.rs

@@ -1,6 +1,6 @@
 //@run
-// ignore-wasm32-bare no libc to test ffi with
-// ignore-emscripten blows the JS stack
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
+//@ignore-target-emscripten blows the JS stack
 
 #![feature(rustc_private)]
 

tests/ui/abi/extern/extern-call-deep2.rs

@@ -1,6 +1,6 @@
 //@run
 #![allow(unused_must_use)]
-// ignore-emscripten no threads support
+//@ignore-target-emscripten no threads support
 #![feature(rustc_private)]
 
 extern crate libc;

tests/ui/abi/extern/extern-call-indirect.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #![feature(rustc_private)]
 

tests/ui/abi/extern/extern-call-scrub.rs

@@ -4,7 +4,7 @@
 // make sure the stack pointers are maintained properly in both
 // directions
 
-// ignore-emscripten no threads support
+//@ignore-target-emscripten no threads support
 #![feature(rustc_private)]
 
 extern crate libc;

tests/ui/abi/extern/extern-crosscrate.rs

@@ -1,6 +1,6 @@
 //@run
 //@aux-build:extern-crosscrate-source.rs
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #![feature(rustc_private)]
 

tests/ui/abi/extern/extern-pass-TwoU16s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a foreign function that accepts and returns a struct
 // by value.

tests/ui/abi/extern/extern-pass-TwoU32s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a foreign function that accepts and returns a struct
 // by value.

tests/ui/abi/extern/extern-pass-TwoU64s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a foreign function that accepts and returns a struct
 // by value.

tests/ui/abi/extern/extern-pass-TwoU8s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a foreign function that accepts and returns a struct
 // by value.

tests/ui/abi/extern/extern-pass-char.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a function that takes/returns a u8.
 

tests/ui/abi/extern/extern-pass-double.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 #[link(name = "rust_test_helpers", kind = "static")]
 extern "C" {

tests/ui/abi/extern/extern-pass-empty.rs

@@ -4,8 +4,8 @@
 // Test a foreign function that accepts empty struct.
 
 // pretty-expanded FIXME #23616
-// ignore-msvc
-// ignore-emscripten emcc asserts on an empty struct as an argument
+//@ignore-target-msvc
+//@ignore-target-emscripten emcc asserts on an empty struct as an argument
 
 #[repr(C)]
 struct TwoU8s {

tests/ui/abi/extern/extern-pass-u32.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a function that takes/returns a u32.
 

tests/ui/abi/extern/extern-pass-u64.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm32-bare no libc for ffi testing
+//@ignore-target-wasm32-unknown-unknown no libc for ffi testing
 
 // Test a call to a function that takes/returns a u64.
 

tests/ui/abi/extern/extern-return-TwoU16s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 pub struct TwoU16s {
     one: u16,

tests/ui/abi/extern/extern-return-TwoU32s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 pub struct TwoU32s {
     one: u32,

tests/ui/abi/extern/extern-return-TwoU64s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 pub struct TwoU64s {
     one: u64,

tests/ui/abi/extern/extern-return-TwoU8s.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 pub struct TwoU8s {
     one: u8,

tests/ui/abi/foreign/foreign-call-no-runtime.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-emscripten no threads support
+//@ignore-target-emscripten no threads support
 
 #![feature(rustc_private)]
 

tests/ui/abi/foreign/foreign-dupe.rs

@@ -1,11 +1,10 @@
 //@run
 //@aux-build:foreign_lib.rs
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 // Check that we can still call duplicated extern (imported) functions
 // which were declared in another crate. See issues #32740 and #32783.
 
-
 extern crate foreign_lib;
 
 pub fn main() {

tests/ui/abi/foreign/foreign-fn-with-byval.rs

@@ -1,7 +1,7 @@
 //@run
 #![allow(improper_ctypes, improper_ctypes_definitions)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #[derive(Copy, Clone)]
 pub struct S {

tests/ui/abi/foreign/foreign-no-abi.rs

@@ -1,7 +1,7 @@
 //@run
 // ABI is cdecl by default
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 // pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]

tests/ui/abi/foreign/invoke-external-foreign.rs

@@ -1,6 +1,6 @@
 //@run
 //@aux-build:foreign_lib.rs
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 // The purpose of this test is to check that we can
 // successfully (and safely) invoke external, cdecl

tests/ui/abi/homogenous-floats-target-feature-mixup.rs

@@ -5,8 +5,8 @@
 // without #[repr(simd)]
 
 //@run
-// ignore-emscripten
-// ignore-sgx no processes
+//@ignore-target-emscripten
+//@ignore-target-sgx no processes
 
 #![feature(avx512_target_feature)]
 

tests/ui/abi/issue-28676.rs

@@ -2,7 +2,7 @@
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #[derive(Copy, Clone)]
 pub struct Quad {

tests/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs

@@ -2,7 +2,7 @@
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #[derive(Copy, Clone)]
 pub struct QuadFloats {

tests/ui/abi/issues/issue-97463-broken-abi-leaked-uninit-data.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm
+//@ignore-target-wasm
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 

tests/ui/abi/lib-defaults.rs

@@ -1,7 +1,7 @@
 //@run
 // dont-check-compiler-stderr (rust-lang/rust#54222)
 
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 //@compile-flags: -lrust_test_helpers
 

tests/ui/abi/mir/mir_codegen_calls_variadic.rs

@@ -1,5 +1,5 @@
 //@run
-// ignore-wasm32-bare no libc to test ffi with
+//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
 
 #[link(name = "rust_test_helpers", kind = "static")]
 extern "C" {

tests/ui/abi/numbers-arithmetic/i128-ffi.rs

@@ -5,8 +5,8 @@
 // C compilers have very inconsistent views on how the ABI
 // should look like.
 
-// ignore-windows
-// ignore-32bit
+//@ignore-target-windows
+//@ignore-32bit
 
 #[link(name = "rust_test_helpers", kind = "static")]
 extern "C" {

tests/ui/abi/segfault-no-out-of-stack.rs

@@ -1,9 +1,9 @@
 //@run
 
 #![allow(unused_imports)]
-// ignore-emscripten can't run commands
-// ignore-sgx no processes
-// ignore-fuchsia must translate zircon signal to SIGSEGV/SIGBUS, FIXME (#58590)
+//@ignore-target-emscripten can't run commands
+//@ignore-target-sgx no processes
+//@ignore-target-fuchsia must translate zircon signal to SIGSEGV/SIGBUS, FIXME (#58590)
 #![feature(rustc_private)]
 
 extern crate libc;