From 4aafecb1693c30625c3f8d75f428edf3dad22755 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Wed, 29 May 2024 16:58:46 +0200 Subject: [PATCH] Simplify check for unsupported architectures --- tests/ui/abi/fixed_x18.arm.stderr | 2 -- tests/ui/abi/fixed_x18.i686.stderr | 2 -- tests/ui/abi/fixed_x18.riscv32.stderr | 2 -- tests/ui/abi/fixed_x18.riscv64.stderr | 2 -- tests/ui/abi/fixed_x18.rs | 2 ++ tests/ui/abi/fixed_x18.x64.stderr | 2 -- 6 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 tests/ui/abi/fixed_x18.arm.stderr delete mode 100644 tests/ui/abi/fixed_x18.i686.stderr delete mode 100644 tests/ui/abi/fixed_x18.riscv32.stderr delete mode 100644 tests/ui/abi/fixed_x18.riscv64.stderr delete mode 100644 tests/ui/abi/fixed_x18.x64.stderr diff --git a/tests/ui/abi/fixed_x18.arm.stderr b/tests/ui/abi/fixed_x18.arm.stderr deleted file mode 100644 index 68728dd9307..00000000000 --- a/tests/ui/abi/fixed_x18.arm.stderr +++ /dev/null @@ -1,2 +0,0 @@ -error: the `-Zfixed-x18` flag is not supported on the `arm` architecture - diff --git a/tests/ui/abi/fixed_x18.i686.stderr b/tests/ui/abi/fixed_x18.i686.stderr deleted file mode 100644 index 458c0679f84..00000000000 --- a/tests/ui/abi/fixed_x18.i686.stderr +++ /dev/null @@ -1,2 +0,0 @@ -error: the `-Zfixed-x18` flag is not supported on the `x86` architecture - diff --git a/tests/ui/abi/fixed_x18.riscv32.stderr b/tests/ui/abi/fixed_x18.riscv32.stderr deleted file mode 100644 index e872fb4455b..00000000000 --- a/tests/ui/abi/fixed_x18.riscv32.stderr +++ /dev/null @@ -1,2 +0,0 @@ -error: the `-Zfixed-x18` flag is not supported on the `riscv32` architecture - diff --git a/tests/ui/abi/fixed_x18.riscv64.stderr b/tests/ui/abi/fixed_x18.riscv64.stderr deleted file mode 100644 index 7127e5d7056..00000000000 --- a/tests/ui/abi/fixed_x18.riscv64.stderr +++ /dev/null @@ -1,2 +0,0 @@ -error: the `-Zfixed-x18` flag is not supported on the `riscv64` architecture - diff --git a/tests/ui/abi/fixed_x18.rs b/tests/ui/abi/fixed_x18.rs index 6d00cb2709d..f1ff3e1d534 100644 --- a/tests/ui/abi/fixed_x18.rs +++ b/tests/ui/abi/fixed_x18.rs @@ -2,6 +2,8 @@ // Behavior on aarch64 is tested by tests/codegen/fixed-x18.rs. // //@ revisions: x64 i686 arm riscv32 riscv64 +//@ error-pattern: the `-Zfixed-x18` flag is not supported +//@ dont-check-compiler-stderr // //@ compile-flags: -Zfixed-x18 //@ [x64] needs-llvm-components: x86 diff --git a/tests/ui/abi/fixed_x18.x64.stderr b/tests/ui/abi/fixed_x18.x64.stderr deleted file mode 100644 index 6dc367f9edc..00000000000 --- a/tests/ui/abi/fixed_x18.x64.stderr +++ /dev/null @@ -1,2 +0,0 @@ -error: the `-Zfixed-x18` flag is not supported on the `x86_64` architecture -