about summary refs log tree commit diff
path: root/tests/ui/amdgpu-require-explicit-cpu.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-04-03 12:05:32 +0000
committerbors <bors@rust-lang.org>2025-04-03 12:05:32 +0000
commit946aea0b3d9f43e57953ce5094d8e4a2a244ce71 (patch)
tree3d8fec4dfe48f821804107325d4bbe571f5f5bf3 /tests/ui/amdgpu-require-explicit-cpu.rs
parente0883a2a6c8e4afcb6e26a182885f687ba63a7f5 (diff)
parent4916d44b59a2b5347506b4551b389fe902bdf54b (diff)
downloadrust-946aea0b3d9f43e57953ce5094d8e4a2a244ce71.tar.gz
rust-946aea0b3d9f43e57953ce5094d8e4a2a244ce71.zip
Auto merge of #139137 - petrochenkov:errwhere2, r=jieyouxu
compiletest: Require `//~` annotations even if `error-pattern` is specified

This is continuation of #138865 with some help from #139100.

`error-pattern` annotations that duplicate the newly added `//~` annotations are removed, other `error-pattern`s are not touched yet.

In exceptional cases `//@ compile-flags: --error-format=human` can be used to opt out of these checks.
In this PR I only had to use the opt out 3 times:
- `tests/ui/parser/utf16-{be,le}-without-bom.rs` - there are too many errors that are nearly identical (modulo location), because an error is reported on every second symbol
- `tests/ui-fulldeps/missing-rustc-driver-error.rs` - the errors list various rustc crate dependencies and may unexpectedly invalidate on random rustc changes
Diffstat (limited to 'tests/ui/amdgpu-require-explicit-cpu.rs')
-rw-r--r--tests/ui/amdgpu-require-explicit-cpu.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/ui/amdgpu-require-explicit-cpu.rs b/tests/ui/amdgpu-require-explicit-cpu.rs
index 46778a1094f..d40cb97977d 100644
--- a/tests/ui/amdgpu-require-explicit-cpu.rs
+++ b/tests/ui/amdgpu-require-explicit-cpu.rs
@@ -3,7 +3,6 @@
 //@ compile-flags: --crate-type=cdylib --target=amdgcn-amd-amdhsa
 //@ needs-llvm-components: amdgpu
 //@ needs-rust-lld
-//@[nocpu] error-pattern: target requires explicitly specifying a cpu
 //@[nocpu] build-fail
 //@[cpu] compile-flags: -Ctarget-cpu=gfx900
 //@[cpu] build-pass
@@ -15,3 +14,5 @@
 trait Sized {}
 
 pub fn foo() {}
+
+//[nocpu]~? ERROR target requires explicitly specifying a cpu with `-C target-cpu`