Skip to content

Commit 0e33c33

Browse files
committed
update tests to use proper error-in-other-file and use new conditions
1 parent 7f12d21 commit 0e33c33

File tree

860 files changed

+1481
-1448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

860 files changed

+1481
-1448
lines changed

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

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
// issue-62350-sysv-neg-reg-counts
2525
// struct-return
2626

27-
// ignore-android
28-
// ignore-arm
29-
// ignore-aarch64
30-
// ignore-windows
27+
//@ignore-target-android
28+
//@ignore-target-arm
29+
//@ignore-target-aarch64
30+
//@ignore-target-windows
3131

3232
// note: windows is ignored as rust_test_helpers does not have the sysv64 abi on windows
3333

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Checks if the correct registers are being used to pass arguments
33
// when the sysv64 ABI is specified.
44

5-
// ignore-android
6-
// ignore-arm
7-
// ignore-aarch64
5+
//@ignore-target-android
6+
//@ignore-target-arm
7+
//@ignore-target-aarch64
88
//@needs-asm-support
99

1010
#[cfg(target_arch = "x86_64")]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@run
22
// pretty-expanded FIXME #23616
3-
// ignore-wasm32-bare no libc to test ffi with
3+
//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
44

55
#![feature(rustc_private)]
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@run
22
// pretty-expanded FIXME #23616
3-
// ignore-wasm32-bare no libc to test ffi with
3+
//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
44

55
#![feature(rustc_private)]
66

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@run
2-
// ignore-wasm32-bare no libc to test with
3-
// ignore-sgx no libc
2+
//@ignore-target-wasm32-unknown-unknown no libc to test with
3+
//@ignore-target-sgx no libc
44

55
#![feature(rustc_private)]
66

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
//@run
2-
// ignore-wasm32-bare no libc to test ffi with
2+
//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
33

44
#[link(name = "rust_test_helpers", kind = "static")]
55
extern "C" {
66
fn rust_int8_to_int32(_: i8) -> i32;
77
}
88

99
fn main() {
10-
let x = unsafe {
11-
rust_int8_to_int32(-1)
12-
};
10+
let x = unsafe { rust_int8_to_int32(-1) };
1311

1412
assert!(x == -1);
1513
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@run
22
//@aux-build:anon-extern-mod-cross-crate-1.rs
33
// pretty-expanded FIXME #23616
4-
// ignore-wasm32-bare no libc to test ffi with
4+
//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
55

66
extern crate anonexternmod;
77

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
//@aux-build:anon-extern-mod-cross-crate-1.rs
33
//@aux-build:anon-extern-mod-cross-crate-1.rs
44
// pretty-expanded FIXME #23616
5-
// ignore-wasm32-bare no libc to test ffi with
5+
//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
66

77
extern crate anonexternmod;
88

9-
pub fn main() { }
9+
pub fn main() {}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@run
2-
// ignore-wasm32-bare no libc to test ffi with
3-
// ignore-emscripten blows the JS stack
2+
//@ignore-target-wasm32-unknown-unknown no libc to test ffi with
3+
//@ignore-target-emscripten blows the JS stack
44

55
#![feature(rustc_private)]
66

0 commit comments

Comments
 (0)