[AUTO-GENERATED] Migrate ui tests from `//` to `//@` directives

author: 许杰友 Jieyou Xu (Joe) <jieyouxu@outlook.com> 2024-02-16 20:02:50 +0000
committer: 许杰友 Jieyou Xu (Joe) <jieyouxu@outlook.com> 2024-02-16 20:02:50 +0000
commit: ec2cc761bc7067712ecc7734502f703fe3b024c8 (patch)
tree: 7ab55cd9562da45b86c959f1b98c199b2b03ca92 /tests/ui/consts
parent: e53d6dd35bb38b81dff4b00497f4c152e9009499 (diff)
download: rust-ec2cc761bc7067712ecc7734502f703fe3b024c8.tar.gz
rust-ec2cc761bc7067712ecc7734502f703fe3b024c8.zip
436 files changed, 576 insertions, 576 deletions
diff --git a/tests/ui/consts/array-literal-index-oob.rs b/tests/ui/consts/array-literal-index-oob.rs
index 67b49b1ba2b..ca56206fbdf 100644
--- a/tests/ui/consts/array-literal-index-oob.rs
+++ b/tests/ui/consts/array-literal-index-oob.rs
@@ -1,5 +1,5 @@
-// build-pass
-// ignore-pass (test emits codegen-time warnings and verifies that they are not errors)
+//@ build-pass
+//@ ignore-pass (test emits codegen-time warnings and verifies that they are not errors)
 
 #![warn(unconditional_panic)]
 
diff --git a/tests/ui/consts/array-to-slice-cast.rs b/tests/ui/consts/array-to-slice-cast.rs
index 796f9d1b71f..633a356aa9e 100644
--- a/tests/ui/consts/array-to-slice-cast.rs
+++ b/tests/ui/consts/array-to-slice-cast.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 fn main() {}
 
diff --git a/tests/ui/consts/assoc-const.rs b/tests/ui/consts/assoc-const.rs
index 021bcb40102..166a3da1518 100644
--- a/tests/ui/consts/assoc-const.rs
+++ b/tests/ui/consts/assoc-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_variables)]
 
 trait Nat {
diff --git a/tests/ui/consts/assoc_const_generic_impl.rs b/tests/ui/consts/assoc_const_generic_impl.rs
index ba358628d15..5820a724d07 100644
--- a/tests/ui/consts/assoc_const_generic_impl.rs
+++ b/tests/ui/consts/assoc_const_generic_impl.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 trait ZeroSized: Sized {
     const I_AM_ZERO_SIZED: ();
diff --git a/tests/ui/consts/associated_const_generic.rs b/tests/ui/consts/associated_const_generic.rs
index dee376cc17b..c385493a65d 100644
--- a/tests/ui/consts/associated_const_generic.rs
+++ b/tests/ui/consts/associated_const_generic.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 trait TraitA {
     const VALUE: usize;
diff --git a/tests/ui/consts/async-block.rs b/tests/ui/consts/async-block.rs
index 78ec8aea724..40be4d195d4 100644
--- a/tests/ui/consts/async-block.rs
+++ b/tests/ui/consts/async-block.rs
@@ -1,7 +1,7 @@
 // gate-test-const_async_blocks
 
-// edition:2018
-// revisions: with_feature without_feature
+//@ edition:2018
+//@ revisions: with_feature without_feature
 
 #![feature(rustc_attrs)]
 #![cfg_attr(with_feature, feature(const_async_blocks))]
diff --git a/tests/ui/consts/bswap-const.rs b/tests/ui/consts/bswap-const.rs
index 3145c21acc9..87b34fb88a5 100644
--- a/tests/ui/consts/bswap-const.rs
+++ b/tests/ui/consts/bswap-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(core_intrinsics)]
 
diff --git a/tests/ui/consts/cast-discriminant-zst-enum.rs b/tests/ui/consts/cast-discriminant-zst-enum.rs
index 2767f178fb6..c75db459c72 100644
--- a/tests/ui/consts/cast-discriminant-zst-enum.rs
+++ b/tests/ui/consts/cast-discriminant-zst-enum.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Test a ZST enum whose dicriminant is ~0i128. This caused an ICE when casting to an i32.
 use std::hint::black_box;
 
diff --git a/tests/ui/consts/chained-constants-stackoverflow.rs b/tests/ui/consts/chained-constants-stackoverflow.rs
index a171567c5d2..0f0ce40a1ed 100644
--- a/tests/ui/consts/chained-constants-stackoverflow.rs
+++ b/tests/ui/consts/chained-constants-stackoverflow.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/34997
 
diff --git a/tests/ui/consts/check_const-feature-gated.rs b/tests/ui/consts/check_const-feature-gated.rs
index f4faab1abc2..ef6c50ff507 100644
--- a/tests/ui/consts/check_const-feature-gated.rs
+++ b/tests/ui/consts/check_const-feature-gated.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const ARR: [usize; 1] = [2];
 
diff --git a/tests/ui/consts/closure-in-foreign-crate.rs b/tests/ui/consts/closure-in-foreign-crate.rs
index fc8f480e706..701cf091045 100644
--- a/tests/ui/consts/closure-in-foreign-crate.rs
+++ b/tests/ui/consts/closure-in-foreign-crate.rs
@@ -1,5 +1,5 @@
-// aux-build:closure-in-foreign-crate.rs
-// build-pass
+//@ aux-build:closure-in-foreign-crate.rs
+//@ build-pass
 
 extern crate closure_in_foreign_crate;
 
diff --git a/tests/ui/consts/closure-structural-match-issue-90013.rs b/tests/ui/consts/closure-structural-match-issue-90013.rs
index 1952ddb941e..7a5d9b69ee4 100644
--- a/tests/ui/consts/closure-structural-match-issue-90013.rs
+++ b/tests/ui/consts/closure-structural-match-issue-90013.rs
@@ -1,5 +1,5 @@
 // Regression test for issue 90013.
-// check-pass
+//@ check-pass
 #![feature(inline_const)]
 
 fn main() {
diff --git a/tests/ui/consts/const-address-of.rs b/tests/ui/consts/const-address-of.rs
index ba162f2a2ba..4eb3c3840ba 100644
--- a/tests/ui/consts/const-address-of.rs
+++ b/tests/ui/consts/const-address-of.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(raw_ref_op)]
 
diff --git a/tests/ui/consts/const-adt-align-mismatch.rs b/tests/ui/consts/const-adt-align-mismatch.rs
index 89b3a9b744b..8faddbff30d 100644
--- a/tests/ui/consts/const-adt-align-mismatch.rs
+++ b/tests/ui/consts/const-adt-align-mismatch.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(deprecated)]
 
diff --git a/tests/ui/consts/const-autoderef.rs b/tests/ui/consts/const-autoderef.rs
index 1c836318d32..36cbdfd4cc7 100644
--- a/tests/ui/consts/const-autoderef.rs
+++ b/tests/ui/consts/const-autoderef.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const A: [u8; 1] = ['h' as u8];
 const B: u8 = (&A)[0];
diff --git a/tests/ui/consts/const-big-enum.rs b/tests/ui/consts/const-big-enum.rs
index 2f21e8a6ddd..88d2f6172a2 100644
--- a/tests/ui/consts/const-big-enum.rs
+++ b/tests/ui/consts/const-big-enum.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 enum Foo {
     Bar(u32),
diff --git a/tests/ui/consts/const-binops.rs b/tests/ui/consts/const-binops.rs
index d038dfeb419..546cc313327 100644
--- a/tests/ui/consts/const-binops.rs
+++ b/tests/ui/consts/const-binops.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 macro_rules! assert_approx_eq {
     ($a:expr, $b:expr) => ({
diff --git a/tests/ui/consts/const-bitshift-rhs-inference.rs b/tests/ui/consts/const-bitshift-rhs-inference.rs
index cf21c296cf3..23437a997e6 100644
--- a/tests/ui/consts/const-bitshift-rhs-inference.rs
+++ b/tests/ui/consts/const-bitshift-rhs-inference.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 const RHS: u8 = 8;
 const IRHS: i8 = 8;
 const RHS16: u16 = 8;
diff --git a/tests/ui/consts/const-block-const-bound.rs b/tests/ui/consts/const-block-const-bound.rs
index 123e5cb1b3e..b0d5e19ad55 100644
--- a/tests/ui/consts/const-block-const-bound.rs
+++ b/tests/ui/consts/const-block-const-bound.rs
@@ -1,4 +1,4 @@
-// known-bug: #103507
+//@ known-bug: #103507
 
 #![allow(unused)]
 #![feature(const_trait_impl, inline_const, negative_impls)]
diff --git a/tests/ui/consts/const-block-cross-crate-fn.rs b/tests/ui/consts/const-block-cross-crate-fn.rs
index 0ac3830d230..6094c1700fc 100644
--- a/tests/ui/consts/const-block-cross-crate-fn.rs
+++ b/tests/ui/consts/const-block-cross-crate-fn.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_const_block.rs
+//@ run-pass
+//@ aux-build:cci_const_block.rs
 
 
 extern crate cci_const_block;
diff --git a/tests/ui/consts/const-block-item-macro-codegen.rs b/tests/ui/consts/const-block-item-macro-codegen.rs
index 7ad883686ae..ccafbcd541e 100644
--- a/tests/ui/consts/const-block-item-macro-codegen.rs
+++ b/tests/ui/consts/const-block-item-macro-codegen.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // General test that function items in static blocks
 // can be generated with a macro.
diff --git a/tests/ui/consts/const-block-item.rs b/tests/ui/consts/const-block-item.rs
index a04f4db263b..e6d6b90290d 100644
--- a/tests/ui/consts/const-block-item.rs
+++ b/tests/ui/consts/const-block-item.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_imports)]
 
 mod foo {
diff --git a/tests/ui/consts/const-block-non-item-statement-3.rs b/tests/ui/consts/const-block-non-item-statement-3.rs
index c513946d189..ba77e721c7f 100644
--- a/tests/ui/consts/const-block-non-item-statement-3.rs
+++ b/tests/ui/consts/const-block-non-item-statement-3.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code, unused)]
 
 type Array = [u32; {  let x = 2; 5 }];
diff --git a/tests/ui/consts/const-block-non-item-statement-rpass.rs b/tests/ui/consts/const-block-non-item-statement-rpass.rs
index 3e52eb50e75..a4576bd1b17 100644
--- a/tests/ui/consts/const-block-non-item-statement-rpass.rs
+++ b/tests/ui/consts/const-block-non-item-statement-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code, unused)]
 
 #[repr(u8)]
diff --git a/tests/ui/consts/const-block-non-item-statement.rs b/tests/ui/consts/const-block-non-item-statement.rs
index 07970b457a3..4cb55e3bde6 100644
--- a/tests/ui/consts/const-block-non-item-statement.rs
+++ b/tests/ui/consts/const-block-non-item-statement.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 enum Foo {
     Bar = { let x = 1; 3 }
diff --git a/tests/ui/consts/const-block.rs b/tests/ui/consts/const-block.rs
index 40c7a7a1da9..326c86f5542 100644
--- a/tests/ui/consts/const-block.rs
+++ b/tests/ui/consts/const-block.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_braces)]
 #![allow(dead_code)]
 #![allow(unused_unsafe)]
diff --git a/tests/ui/consts/const-blocks/const-repeat.rs b/tests/ui/consts/const-blocks/const-repeat.rs
index 65d02317d34..89dfbc3cbad 100644
--- a/tests/ui/consts/const-blocks/const-repeat.rs
+++ b/tests/ui/consts/const-blocks/const-repeat.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Repeating a *constant* of non-Copy type (not just a constant expression) is already stable.
 
diff --git a/tests/ui/consts/const-blocks/fn-call-in-const.rs b/tests/ui/consts/const-blocks/fn-call-in-const.rs
index 20496f62712..9bf267b7de9 100644
--- a/tests/ui/consts/const-blocks/fn-call-in-const.rs
+++ b/tests/ui/consts/const-blocks/fn-call-in-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(inline_const)]
 #![allow(unused)]
diff --git a/tests/ui/consts/const-blocks/migrate-pass.rs b/tests/ui/consts/const-blocks/migrate-pass.rs
index fd66f5aa64f..308834bd646 100644
--- a/tests/ui/consts/const-blocks/migrate-pass.rs
+++ b/tests/ui/consts/const-blocks/migrate-pass.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(warnings)]
 
 // Some type that is not copyable.
diff --git a/tests/ui/consts/const-blocks/nll-pass.rs b/tests/ui/consts/const-blocks/nll-pass.rs
index fd66f5aa64f..308834bd646 100644
--- a/tests/ui/consts/const-blocks/nll-pass.rs
+++ b/tests/ui/consts/const-blocks/nll-pass.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(warnings)]
 
 // Some type that is not copyable.
diff --git a/tests/ui/consts/const-blocks/run-pass.rs b/tests/ui/consts/const-blocks/run-pass.rs
index e11f69babf7..e5c6bba40cb 100644
--- a/tests/ui/consts/const-blocks/run-pass.rs
+++ b/tests/ui/consts/const-blocks/run-pass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #[derive(Debug, Eq, PartialEq)]
 struct Bar;
diff --git a/tests/ui/consts/const-bound.rs b/tests/ui/consts/const-bound.rs
index 735056a0ab0..682a2dcbbc6 100644
--- a/tests/ui/consts/const-bound.rs
+++ b/tests/ui/consts/const-bound.rs
@@ -1,9 +1,9 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // Make sure const bounds work on things, and test that a few types
 // are const.
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 fn foo<T: Sync>(x: T) -> T { x }
 
diff --git a/tests/ui/consts/const-byte-str-cast.rs b/tests/ui/consts/const-byte-str-cast.rs
index 65d626c297f..c739e01a37a 100644
--- a/tests/ui/consts/const-byte-str-cast.rs
+++ b/tests/ui/consts/const-byte-str-cast.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[deny(warnings)]
 
 pub fn main() {
diff --git a/tests/ui/consts/const-cast-ptr-int.rs b/tests/ui/consts/const-cast-ptr-int.rs
index 987d9616e91..68efc0c644c 100644
--- a/tests/ui/consts/const-cast-ptr-int.rs
+++ b/tests/ui/consts/const-cast-ptr-int.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 use std::ptr;
diff --git a/tests/ui/consts/const-cast.rs b/tests/ui/consts/const-cast.rs
index abeb24121eb..9a4cce97e3e 100644
--- a/tests/ui/consts/const-cast.rs
+++ b/tests/ui/consts/const-cast.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 struct TestStruct {
diff --git a/tests/ui/consts/const-compare-bytes-ub.rs b/tests/ui/consts/const-compare-bytes-ub.rs
index 2b4062fd22b..b357bab96a4 100644
--- a/tests/ui/consts/const-compare-bytes-ub.rs
+++ b/tests/ui/consts/const-compare-bytes-ub.rs
@@ -1,4 +1,4 @@
-// check-fail
+//@ check-fail
 
 #![feature(core_intrinsics)]
 #![feature(const_intrinsic_compare_bytes)]
diff --git a/tests/ui/consts/const-compare-bytes.rs b/tests/ui/consts/const-compare-bytes.rs
index 74e29f81386..8596a2d9df9 100644
--- a/tests/ui/consts/const-compare-bytes.rs
+++ b/tests/ui/consts/const-compare-bytes.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(core_intrinsics)]
 #![feature(const_intrinsic_compare_bytes)]
diff --git a/tests/ui/consts/const-const.rs b/tests/ui/consts/const-const.rs
index 85e4a72e86d..bad2752a3af 100644
--- a/tests/ui/consts/const-const.rs
+++ b/tests/ui/consts/const-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 const a: isize = 1;
diff --git a/tests/ui/consts/const-contents.rs b/tests/ui/consts/const-contents.rs
index 7ba3d435650..d486325796f 100644
--- a/tests/ui/consts/const-contents.rs
+++ b/tests/ui/consts/const-contents.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Issue #570
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/const-deref.rs b/tests/ui/consts/const-deref.rs
index 6060d8e510e..21a5eb3b64d 100644
--- a/tests/ui/consts/const-deref.rs
+++ b/tests/ui/consts/const-deref.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const C: &'static isize = &1000;
 static D: isize = *C;
diff --git a/tests/ui/consts/const-endianess.rs b/tests/ui/consts/const-endianess.rs
index 936f31954d3..cfb9994843b 100644
--- a/tests/ui/consts/const-endianess.rs
+++ b/tests/ui/consts/const-endianess.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(test)]
 
 extern crate test;
diff --git a/tests/ui/consts/const-enum-byref-self.rs b/tests/ui/consts/const-enum-byref-self.rs
index b7e14bfb765..435d714ad83 100644
--- a/tests/ui/consts/const-enum-byref-self.rs
+++ b/tests/ui/consts/const-enum-byref-self.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V, VV(isize) }
diff --git a/tests/ui/consts/const-enum-byref.rs b/tests/ui/consts/const-enum-byref.rs
index badf5294654..0284bb9d9ea 100644
--- a/tests/ui/consts/const-enum-byref.rs
+++ b/tests/ui/consts/const-enum-byref.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V, VV(isize) }
diff --git a/tests/ui/consts/const-enum-cast.rs b/tests/ui/consts/const-enum-cast.rs
index 39968495144..adcfa7f0fe0 100644
--- a/tests/ui/consts/const-enum-cast.rs
+++ b/tests/ui/consts/const-enum-cast.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 enum A { A1, A2 }
diff --git a/tests/ui/consts/const-enum-ptr.rs b/tests/ui/consts/const-enum-ptr.rs
index 84f4eb8406d..1e12c69428e 100644
--- a/tests/ui/consts/const-enum-ptr.rs
+++ b/tests/ui/consts/const-enum-ptr.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V0, V1(isize) }
diff --git a/tests/ui/consts/const-enum-struct.rs b/tests/ui/consts/const-enum-struct.rs
index ee88c936188..60836a2b998 100644
--- a/tests/ui/consts/const-enum-struct.rs
+++ b/tests/ui/consts/const-enum-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V16(u16), V32(u32) }
diff --git a/tests/ui/consts/const-enum-struct2.rs b/tests/ui/consts/const-enum-struct2.rs
index 6dfe63d5d00..4512c93dca6 100644
--- a/tests/ui/consts/const-enum-struct2.rs
+++ b/tests/ui/consts/const-enum-struct2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V0, V16(u16) }
diff --git a/tests/ui/consts/const-enum-structlike.rs b/tests/ui/consts/const-enum-structlike.rs
index 0ea79aebce6..165dae6f5ff 100644
--- a/tests/ui/consts/const-enum-structlike.rs
+++ b/tests/ui/consts/const-enum-structlike.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E {
diff --git a/tests/ui/consts/const-enum-tuple.rs b/tests/ui/consts/const-enum-tuple.rs
index e0363166b02..fe6b54aa793 100644
--- a/tests/ui/consts/const-enum-tuple.rs
+++ b/tests/ui/consts/const-enum-tuple.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V16(u16), V32(u32) }
diff --git a/tests/ui/consts/const-enum-tuple2.rs b/tests/ui/consts/const-enum-tuple2.rs
index ef378b5995d..713209943d3 100644
--- a/tests/ui/consts/const-enum-tuple2.rs
+++ b/tests/ui/consts/const-enum-tuple2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V0, V16(u16) }
diff --git a/tests/ui/consts/const-enum-tuplestruct.rs b/tests/ui/consts/const-enum-tuplestruct.rs
index f93945c6a68..f2363bf03cd 100644
--- a/tests/ui/consts/const-enum-tuplestruct.rs
+++ b/tests/ui/consts/const-enum-tuplestruct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V16(u16), V32(u32) }
diff --git a/tests/ui/consts/const-enum-tuplestruct2.rs b/tests/ui/consts/const-enum-tuplestruct2.rs
index b8aa9a3152f..dc445323695 100644
--- a/tests/ui/consts/const-enum-tuplestruct2.rs
+++ b/tests/ui/consts/const-enum-tuplestruct2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E { V0, V16(u16) }
diff --git a/tests/ui/consts/const-enum-vec-index.rs b/tests/ui/consts/const-enum-vec-index.rs
index 3f155340ab5..313d35ff6e0 100644
--- a/tests/ui/consts/const-enum-vec-index.rs
+++ b/tests/ui/consts/const-enum-vec-index.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[derive(Copy, Clone)]
 enum E { V1(isize), V0 }
 
diff --git a/tests/ui/consts/const-enum-vec-ptr.rs b/tests/ui/consts/const-enum-vec-ptr.rs
index 43ffe6570dc..3ae58dfa7b7 100644
--- a/tests/ui/consts/const-enum-vec-ptr.rs
+++ b/tests/ui/consts/const-enum-vec-ptr.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 enum E { V1(isize), V0 }
 static C: &'static [E] = &[E::V0, E::V1(0xDEADBEE), E::V0];
diff --git a/tests/ui/consts/const-enum-vector.rs b/tests/ui/consts/const-enum-vector.rs
index ee3739f9723..23658fa2155 100644
--- a/tests/ui/consts/const-enum-vector.rs
+++ b/tests/ui/consts/const-enum-vector.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 enum E { V1(isize), V0 }
 static C: [E; 3] = [E::V0, E::V1(0xDEADBEE), E::V0];
diff --git a/tests/ui/consts/const-err-late.rs b/tests/ui/consts/const-err-late.rs
index d2476e49346..6dff2c101a0 100644
--- a/tests/ui/consts/const-err-late.rs
+++ b/tests/ui/consts/const-err-late.rs
@@ -1,5 +1,5 @@
-// build-fail
-// compile-flags: -C overflow-checks=on
+//@ build-fail
+//@ compile-flags: -C overflow-checks=on
 
 #![allow(arithmetic_overflow, unconditional_panic)]
 
diff --git a/tests/ui/consts/const-err-rpass.rs b/tests/ui/consts/const-err-rpass.rs
index e7fa10a2a11..b526ef76eee 100644
--- a/tests/ui/consts/const-err-rpass.rs
+++ b/tests/ui/consts/const-err-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // check for const_err regressions
 
diff --git a/tests/ui/consts/const-err2.rs b/tests/ui/consts/const-err2.rs
index db49ec25aaa..67c85d35401 100644
--- a/tests/ui/consts/const-err2.rs
+++ b/tests/ui/consts/const-err2.rs
@@ -2,12 +2,12 @@
 // optimized compilation and unoptimized compilation and thus would
 // lead to different lints being emitted
 
-// revisions: noopt opt opt_with_overflow_checks
-//[noopt]compile-flags: -C opt-level=0
-//[opt]compile-flags: -O
-//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+//@ revisions: noopt opt opt_with_overflow_checks
+//@[noopt]compile-flags: -C opt-level=0
+//@[opt]compile-flags: -O
+//@[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
 
-// build-fail
+//@ build-fail
 
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/consts/const-eval/const-eval-query-stack.rs b/tests/ui/consts/const-eval/const-eval-query-stack.rs
index 4eaff494783..53589bfd2ab 100644
--- a/tests/ui/consts/const-eval/const-eval-query-stack.rs
+++ b/tests/ui/consts/const-eval/const-eval-query-stack.rs
@@ -1,16 +1,16 @@
-// compile-flags: -Ztreat-err-as-bug=1
-// failure-status: 101
-// rustc-env:RUST_BACKTRACE=1
-// normalize-stderr-test "\nerror: .*unexpectedly panicked.*\n\n" -> ""
-// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
-// normalize-stderr-test "note: compiler flags.*\n\n" -> ""
-// normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
-// normalize-stderr-test "thread.*panicked.*:\n.*\n" -> ""
-// normalize-stderr-test "stack backtrace:\n" -> ""
-// normalize-stderr-test "\s\d{1,}: .*\n" -> ""
-// normalize-stderr-test "\s at .*\n" -> ""
-// normalize-stderr-test ".*note: Some details.*\n" -> ""
-// normalize-stderr-test ".*omitted \d{1,} frame.*\n" -> ""
+//@ compile-flags: -Ztreat-err-as-bug=1
+//@ failure-status: 101
+//@ rustc-env:RUST_BACKTRACE=1
+//@ normalize-stderr-test "\nerror: .*unexpectedly panicked.*\n\n" -> ""
+//@ normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
+//@ normalize-stderr-test "note: compiler flags.*\n\n" -> ""
+//@ normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
+//@ normalize-stderr-test "thread.*panicked.*:\n.*\n" -> ""
+//@ normalize-stderr-test "stack backtrace:\n" -> ""
+//@ normalize-stderr-test "\s\d{1,}: .*\n" -> ""
+//@ normalize-stderr-test "\s at .*\n" -> ""
+//@ normalize-stderr-test ".*note: Some details.*\n" -> ""
+//@ normalize-stderr-test ".*omitted \d{1,} frame.*\n" -> ""
 #![allow(unconditional_panic)]
 
 const X: i32 = 1 / 0; //~ERROR constant
diff --git a/tests/ui/consts/const-eval/const-pointer-values-in-various-types.rs b/tests/ui/consts/const-eval/const-pointer-values-in-various-types.rs
index 45eed9d842a..d6b6d427807 100644
--- a/tests/ui/consts/const-eval/const-pointer-values-in-various-types.rs
+++ b/tests/ui/consts/const-eval/const-pointer-values-in-various-types.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// stderr-per-bitwidth
+//@ only-x86_64
+//@ stderr-per-bitwidth
 
 #[repr(C)]
 union Nonsense {
diff --git a/tests/ui/consts/const-eval/const_fn_ptr.rs b/tests/ui/consts/const-eval/const_fn_ptr.rs
index b3c677c6984..f8a2658f31e 100644
--- a/tests/ui/consts/const-eval/const_fn_ptr.rs
+++ b/tests/ui/consts/const-eval/const_fn_ptr.rs
@@ -1,5 +1,5 @@
-// run-pass
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ run-pass
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 fn double(x: usize) -> usize { x * 2 }
 const fn double_const(x: usize) -> usize { x * 2 }
diff --git a/tests/ui/consts/const-eval/const_fn_ptr_fail.rs b/tests/ui/consts/const-eval/const_fn_ptr_fail.rs
index 1896eba82f2..a0f804722db 100644
--- a/tests/ui/consts/const-eval/const_fn_ptr_fail.rs
+++ b/tests/ui/consts/const-eval/const_fn_ptr_fail.rs
@@ -1,5 +1,5 @@
-// run-pass
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ run-pass
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 #![allow(unused)]
 
 fn double(x: usize) -> usize { x * 2 }
diff --git a/tests/ui/consts/const-eval/const_fn_ptr_fail2.rs b/tests/ui/consts/const-eval/const_fn_ptr_fail2.rs
index b873940c4b3..87f8b52a650 100644
--- a/tests/ui/consts/const-eval/const_fn_ptr_fail2.rs
+++ b/tests/ui/consts/const-eval/const_fn_ptr_fail2.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 fn double(x: usize) -> usize {
     x * 2
diff --git a/tests/ui/consts/const-eval/const_fn_target_feature.rs b/tests/ui/consts/const-eval/const_fn_target_feature.rs
index 5d02ce3f21b..b56b68a5795 100644
--- a/tests/ui/consts/const-eval/const_fn_target_feature.rs
+++ b/tests/ui/consts/const-eval/const_fn_target_feature.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// compile-flags:-C target-feature=+ssse3
+//@ only-x86_64
+//@ compile-flags:-C target-feature=+ssse3
 
 #![crate_type = "lib"]
 
diff --git a/tests/ui/consts/const-eval/const_fn_target_feature_wasm.rs b/tests/ui/consts/const-eval/const_fn_target_feature_wasm.rs
index c1460fdd9ec..deed09e4b2a 100644
--- a/tests/ui/consts/const-eval/const_fn_target_feature_wasm.rs
+++ b/tests/ui/consts/const-eval/const_fn_target_feature_wasm.rs
@@ -1,6 +1,6 @@
-// only-wasm32
-// compile-flags:-C target-feature=-simd128
-// build-pass
+//@ only-wasm32
+//@ compile-flags:-C target-feature=-simd128
+//@ build-pass
 
 #![crate_type = "lib"]
 
diff --git a/tests/ui/consts/const-eval/const_panic_2021.rs b/tests/ui/consts/const-eval/const_panic_2021.rs
index 4702aa2f5f0..31a80e71b7c 100644
--- a/tests/ui/consts/const-eval/const_panic_2021.rs
+++ b/tests/ui/consts/const-eval/const_panic_2021.rs
@@ -1,4 +1,4 @@
-// edition:2021
+//@ edition:2021
 #![crate_type = "lib"]
 
 const MSG: &str = "hello";
diff --git a/tests/ui/consts/const-eval/const_panic_stability.rs b/tests/ui/consts/const-eval/const_panic_stability.rs
index 1aee6f27e27..c49f6dc6fd6 100644
--- a/tests/ui/consts/const-eval/const_panic_stability.rs
+++ b/tests/ui/consts/const-eval/const_panic_stability.rs
@@ -1,7 +1,7 @@
-// revisions: e2018 e2021
-//[e2018] edition:2018
-//[e2021] edition:2021
-//[e2018] check-pass
+//@ revisions: e2018 e2021
+//@[e2018] edition:2018
+//@[e2021] edition:2021
+//@[e2018] check-pass
 #![crate_type = "lib"]
 #![stable(feature = "foo", since = "1.0.0")]
 #![feature(staged_api)]
diff --git a/tests/ui/consts/const-eval/const_prop_errors.rs b/tests/ui/consts/const-eval/const_prop_errors.rs
index f9a36d37943..4580944e1bc 100644
--- a/tests/ui/consts/const-eval/const_prop_errors.rs
+++ b/tests/ui/consts/const-eval/const_prop_errors.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub trait Foo {
     fn foo(self) -> u32;
diff --git a/tests/ui/consts/const-eval/const_signed_pat.rs b/tests/ui/consts/const-eval/const_signed_pat.rs
index c61239bb677..822cec2eaa7 100644
--- a/tests/ui/consts/const-eval/const_signed_pat.rs
+++ b/tests/ui/consts/const-eval/const_signed_pat.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 fn main() {
     const MIN: i8 = -5;
diff --git a/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs
index ea35f46807a..24b9b3123e1 100644
--- a/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs
+++ b/tests/ui/consts/const-eval/dont_promote_unstable_const_fn_cross_crate.rs
@@ -1,4 +1,4 @@
-// aux-build:stability.rs
+//@ aux-build:stability.rs
 
 extern crate stability;
 
diff --git a/tests/ui/consts/const-eval/double_check.rs b/tests/ui/consts/const-eval/double_check.rs
index 56ca0aa1f15..12738e59d7f 100644
--- a/tests/ui/consts/const-eval/double_check.rs
+++ b/tests/ui/consts/const-eval/double_check.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 enum Foo {
     A = 5,
diff --git a/tests/ui/consts/const-eval/double_check2.rs b/tests/ui/consts/const-eval/double_check2.rs
index 81f5dde450b..228efec2879 100644
--- a/tests/ui/consts/const-eval/double_check2.rs
+++ b/tests/ui/consts/const-eval/double_check2.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // This test exhibits undefined behavior, but it is very expensive and complex to check for such
 // UB in constants.
diff --git a/tests/ui/consts/const-eval/duration_conversion.rs b/tests/ui/consts/const-eval/duration_conversion.rs
index 87b12937dd4..874200326e8 100644
--- a/tests/ui/consts/const-eval/duration_conversion.rs
+++ b/tests/ui/consts/const-eval/duration_conversion.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 use std::time::Duration;
 
diff --git a/tests/ui/consts/const-eval/enum_discr.rs b/tests/ui/consts/const-eval/enum_discr.rs
index e09258f1120..d3401b36a8d 100644
--- a/tests/ui/consts/const-eval/enum_discr.rs
+++ b/tests/ui/consts/const-eval/enum_discr.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 enum Foo {
     X = 42,
diff --git a/tests/ui/consts/const-eval/extern_fat_pointer.rs b/tests/ui/consts/const-eval/extern_fat_pointer.rs
index d91d07827dc..d03415aa269 100644
--- a/tests/ui/consts/const-eval/extern_fat_pointer.rs
+++ b/tests/ui/consts/const-eval/extern_fat_pointer.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(extern_types)]
 
diff --git a/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs
index 6bc5faac532..0c292ec5af7 100644
--- a/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_nontransient.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(core_intrinsics)]
 #![feature(const_heap)]
 #![feature(const_mut_refs)]
diff --git a/tests/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs
index 92193bb33e2..1ba20f908ea 100644
--- a/tests/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_transient.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(core_intrinsics)]
 #![feature(const_heap)]
 #![feature(const_mut_refs)]
diff --git a/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs
index b53c9ac7a2c..ed483bccc1f 100644
--- a/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.rs
@@ -1,4 +1,4 @@
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 // compile-test
 #![feature(core_intrinsics)]
 #![feature(const_heap)]
diff --git a/tests/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs b/tests/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs
index 407e69d41a0..6c4fca35626 100644
--- a/tests/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_zero_sized.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(core_intrinsics)]
 #![feature(const_heap)]
 #![feature(inline_const)]
diff --git a/tests/ui/consts/const-eval/heap/dealloc_intrinsic.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic.rs
index aac90cd54cc..345fc096ca1 100644
--- a/tests/ui/consts/const-eval/heap/dealloc_intrinsic.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(core_intrinsics)]
 #![feature(const_heap)]
 #![feature(const_mut_refs)]
diff --git a/tests/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs
index 84fb4d2ea87..146a87862e8 100644
--- a/tests/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs
+++ b/tests/ui/consts/const-eval/heap/dealloc_intrinsic_zero_sized.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(core_intrinsics)]
 #![feature(const_heap)]
 #![feature(inline_const)]
diff --git a/tests/ui/consts/const-eval/ice-generic-assoc-const.rs b/tests/ui/consts/const-eval/ice-generic-assoc-const.rs
index e514682af9c..d758435bb20 100644
--- a/tests/ui/consts/const-eval/ice-generic-assoc-const.rs
+++ b/tests/ui/consts/const-eval/ice-generic-assoc-const.rs
@@ -1,4 +1,4 @@
-// build-pass (tests post-monomorphisation failure)
+//@ build-pass (tests post-monomorphisation failure)
 #![crate_type = "lib"]
 
 pub trait Nullable {
diff --git a/tests/ui/consts/const-eval/ice-packed.rs b/tests/ui/consts/const-eval/ice-packed.rs
index 4758a5a9d56..96be67bd7ca 100644
--- a/tests/ui/consts/const-eval/ice-packed.rs
+++ b/tests/ui/consts/const-eval/ice-packed.rs
@@ -1,7 +1,7 @@
 // Regression test for #50356: Compiler panic when using repr(packed)
 // associated constant in a match arm
 
-// check-pass
+//@ check-pass
 #[derive(Copy, Clone, PartialEq, Eq)]
 #[repr(packed)]
 pub struct Num(u64);
diff --git a/tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs b/tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs
index bc2ea3f18fa..25ffc9cbdba 100644
--- a/tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs
+++ b/tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 // Regression test for #66975
 #![warn(unconditional_panic)]
diff --git a/tests/ui/consts/const-eval/index_out_of_bounds_propagated.rs b/tests/ui/consts/const-eval/index_out_of_bounds_propagated.rs
index 608e6e112a1..112c7415076 100644
--- a/tests/ui/consts/const-eval/index_out_of_bounds_propagated.rs
+++ b/tests/ui/consts/const-eval/index_out_of_bounds_propagated.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 fn main() {
     let array = [std::env::args().len()];
diff --git a/tests/ui/consts/const-eval/infinite_loop.rs b/tests/ui/consts/const-eval/infinite_loop.rs
index 9bdb9929bec..44456f1ce47 100644
--- a/tests/ui/consts/const-eval/infinite_loop.rs
+++ b/tests/ui/consts/const-eval/infinite_loop.rs
@@ -2,7 +2,7 @@
 //! 1. we error if a const evaluation hits the deny-by-default lint limit
 //! 2. we do not ICE on invalid follow-up code
 
-// compile-flags: -Z tiny-const-eval-limit
+//@ compile-flags: -Z tiny-const-eval-limit
 
 fn main() {
     // Tests the Collatz conjecture with an incorrect base case (0 instead of 1).
diff --git a/tests/ui/consts/const-eval/issue-100878.rs b/tests/ui/consts/const-eval/issue-100878.rs
index bd56f854c8b..5a0bc5fc28d 100644
--- a/tests/ui/consts/const-eval/issue-100878.rs
+++ b/tests/ui/consts/const-eval/issue-100878.rs
@@ -1,6 +1,6 @@
 // This checks that the const-eval ICE in issue #100878 does not recur.
 //
-// build-pass
+//@ build-pass
 
 #[allow(arithmetic_overflow)]
 pub fn bitshift_data(data: [u8; 1]) -> u8 {
diff --git a/tests/ui/consts/const-eval/issue-114994-fail.rs b/tests/ui/consts/const-eval/issue-114994-fail.rs
index 72350464091..1b9abec3571 100644
--- a/tests/ui/consts/const-eval/issue-114994-fail.rs
+++ b/tests/ui/consts/const-eval/issue-114994-fail.rs
@@ -1,7 +1,7 @@
 // This checks that function pointer signatures that are referenced mutably
 // but contain a &mut T parameter still fail in a constant context: see issue #114994.
 //
-// check-fail
+//@ check-fail
 
 const fn use_mut_const_fn(_f: &mut fn(&mut String)) { //~ ERROR mutable references are not allowed in constant functions
     ()
diff --git a/tests/ui/consts/const-eval/issue-114994.rs b/tests/ui/consts/const-eval/issue-114994.rs
index a4cb2e61e5f..5d99f265e62 100644
--- a/tests/ui/consts/const-eval/issue-114994.rs
+++ b/tests/ui/consts/const-eval/issue-114994.rs
@@ -1,7 +1,7 @@
 // This checks that function pointer signatures containing &mut T types
 // work in a constant context: see issue #114994.
 //
-// check-pass
+//@ check-pass
 
 const fn use_const_fn(_f: fn(&mut String)) {
     ()
diff --git a/tests/ui/consts/const-eval/issue-44578.rs b/tests/ui/consts/const-eval/issue-44578.rs
index e4dcc62302c..945bf93f8fa 100644
--- a/tests/ui/consts/const-eval/issue-44578.rs
+++ b/tests/ui/consts/const-eval/issue-44578.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 trait Foo {
     const AMT: usize;
diff --git a/tests/ui/consts/const-eval/issue-47971.rs b/tests/ui/consts/const-eval/issue-47971.rs
index b98e76031d4..74eac963408 100644
--- a/tests/ui/consts/const-eval/issue-47971.rs
+++ b/tests/ui/consts/const-eval/issue-47971.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 struct S(pub &'static u32, pub u32);
 
diff --git a/tests/ui/consts/const-eval/issue-50706.rs b/tests/ui/consts/const-eval/issue-50706.rs
index a13c27f2e78..a0eccb5d000 100644
--- a/tests/ui/consts/const-eval/issue-50706.rs
+++ b/tests/ui/consts/const-eval/issue-50706.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub struct Stats;
 
diff --git a/tests/ui/consts/const-eval/issue-50814-2.rs b/tests/ui/consts/const-eval/issue-50814-2.rs
index 2eab93beb20..c2e2de67a65 100644
--- a/tests/ui/consts/const-eval/issue-50814-2.rs
+++ b/tests/ui/consts/const-eval/issue-50814-2.rs
@@ -1,6 +1,6 @@
-// build-fail
-// revisions: normal mir-opt
-// [mir-opt]compile-flags: -Zmir-opt-level=4
+//@ build-fail
+//@ revisions: normal mir-opt
+//@ [mir-opt]compile-flags: -Zmir-opt-level=4
 
 trait C {
     const BOO: usize;
diff --git a/tests/ui/consts/const-eval/issue-50814.rs b/tests/ui/consts/const-eval/issue-50814.rs
index 374ed1d93df..ca26f51f111 100644
--- a/tests/ui/consts/const-eval/issue-50814.rs
+++ b/tests/ui/consts/const-eval/issue-50814.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 trait Unsigned {
     const MAX: u8;
diff --git a/tests/ui/consts/const-eval/issue-51300.rs b/tests/ui/consts/const-eval/issue-51300.rs
index 8e68e8c9117..5e6ce350e60 100644
--- a/tests/ui/consts/const-eval/issue-51300.rs
+++ b/tests/ui/consts/const-eval/issue-51300.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 // https://github.com/rust-lang/rust/issues/51300
 
 #[derive(PartialEq, Eq, Clone, Copy)]
diff --git a/tests/ui/consts/const-eval/issue-53157.rs b/tests/ui/consts/const-eval/issue-53157.rs
index 850338625bc..b65cb604a04 100644
--- a/tests/ui/consts/const-eval/issue-53157.rs
+++ b/tests/ui/consts/const-eval/issue-53157.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 macro_rules! m {
     () => {{
diff --git a/tests/ui/consts/const-eval/issue-53401.rs b/tests/ui/consts/const-eval/issue-53401.rs
index 31c946c3cb7..8d3c15ea002 100644
--- a/tests/ui/consts/const-eval/issue-53401.rs
+++ b/tests/ui/consts/const-eval/issue-53401.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub const STATIC_TRAIT: &dyn Test = &();
 
diff --git a/tests/ui/consts/const-eval/issue-55541.rs b/tests/ui/consts/const-eval/issue-55541.rs
index fa5a493abde..21bc89c2dda 100644
--- a/tests/ui/consts/const-eval/issue-55541.rs
+++ b/tests/ui/consts/const-eval/issue-55541.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // Test that we can handle newtypes wrapping extern types
 
diff --git a/tests/ui/consts/const-eval/issue-64908.rs b/tests/ui/consts/const-eval/issue-64908.rs
index d2e09507284..5d5fdab790e 100644
--- a/tests/ui/consts/const-eval/issue-64908.rs
+++ b/tests/ui/consts/const-eval/issue-64908.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // This test verifies that the `ConstProp` pass doesn't cause an ICE when evaluating polymorphic
 // promoted MIR.
diff --git a/tests/ui/consts/const-eval/issue-64970.rs b/tests/ui/consts/const-eval/issue-64970.rs
index ba530438f9a..c7be311ce6b 100644
--- a/tests/ui/consts/const-eval/issue-64970.rs
+++ b/tests/ui/consts/const-eval/issue-64970.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn main() {
     foo(10);
diff --git a/tests/ui/consts/const-eval/issue-70804-fn-subtyping.rs b/tests/ui/consts/const-eval/issue-70804-fn-subtyping.rs
index abd1d32abe2..8d96d247c19 100644
--- a/tests/ui/consts/const-eval/issue-70804-fn-subtyping.rs
+++ b/tests/ui/consts/const-eval/issue-70804-fn-subtyping.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const fn nested(x: (for<'a> fn(&'a ()), String)) -> (fn(&'static ()), String) {
     x
diff --git a/tests/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs b/tests/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs
index 7e235c4911c..885869bdab3 100644
--- a/tests/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs
+++ b/tests/ui/consts/const-eval/issue-84957-const-str-as-bytes.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 trait Foo {}
 
diff --git a/tests/ui/consts/const-eval/issue-85155.rs b/tests/ui/consts/const-eval/issue-85155.rs
index c3216d53d05..95253a0b288 100644
--- a/tests/ui/consts/const-eval/issue-85155.rs
+++ b/tests/ui/consts/const-eval/issue-85155.rs
@@ -8,8 +8,8 @@
 // Therefore, its setup is reproduced with an aux crate, which will similarly trigger a PME
 // depending on the const argument value, like the `stdarch` intrinsics would.
 //
-// aux-build: post_monomorphization_error.rs
-// build-fail: this is a post-monomorphization error, it passes check runs and requires building
+//@ aux-build: post_monomorphization_error.rs
+//@ build-fail: this is a post-monomorphization error, it passes check runs and requires building
 //             to actually fail.
 
 extern crate post_monomorphization_error;
diff --git a/tests/ui/consts/const-eval/no_lint_for_statically_known_error.rs b/tests/ui/consts/const-eval/no_lint_for_statically_known_error.rs
index 910ca3c4bcb..6dae6ff1b3d 100644
--- a/tests/ui/consts/const-eval/no_lint_for_statically_known_error.rs
+++ b/tests/ui/consts/const-eval/no_lint_for_statically_known_error.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // if `X` were used instead of `x`, `X - 10` would result in a lint.
 // This file should never produce a lint, no matter how the const
diff --git a/tests/ui/consts/const-eval/nonnull_as_ref.rs b/tests/ui/consts/const-eval/nonnull_as_ref.rs
index eb4683e2c30..003b28febff 100644
--- a/tests/ui/consts/const-eval/nonnull_as_ref.rs
+++ b/tests/ui/consts/const-eval/nonnull_as_ref.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 use std::ptr::NonNull;
 
diff --git a/tests/ui/consts/const-eval/nrvo.rs b/tests/ui/consts/const-eval/nrvo.rs
index 22da96a3fc1..02288d8d60c 100644
--- a/tests/ui/consts/const-eval/nrvo.rs
+++ b/tests/ui/consts/const-eval/nrvo.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // When the NRVO is applied, the return place (`_0`) gets treated like a normal local. For example,
 // its address may be taken and it may be written to indirectly. Ensure that the const-eval
diff --git a/tests/ui/consts/const-eval/panic-assoc-never-type.rs b/tests/ui/consts/const-eval/panic-assoc-never-type.rs
index 88ce5b0d895..bdaa51494b9 100644
--- a/tests/ui/consts/const-eval/panic-assoc-never-type.rs
+++ b/tests/ui/consts/const-eval/panic-assoc-never-type.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 // Regression test for #66975
 #![feature(never_type)]
diff --git a/tests/ui/consts/const-eval/promote-static.rs b/tests/ui/consts/const-eval/promote-static.rs
index d3c663c53e9..53b5ab294d7 100644
--- a/tests/ui/consts/const-eval/promote-static.rs
+++ b/tests/ui/consts/const-eval/promote-static.rs
@@ -1,6 +1,6 @@
 // regression test for #67609.
 
-// check-pass
+//@ check-pass
 
 static NONE: Option<String> = None;
 
diff --git a/tests/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs b/tests/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs
index edda10e6e82..666bec83f62 100644
--- a/tests/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs
+++ b/tests/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub fn main() {
     let y: &'static mut [u8; 0] = &mut [];
diff --git a/tests/ui/consts/const-eval/promoted_errors.rs b/tests/ui/consts/const-eval/promoted_errors.rs
index 5e67dc6f6c3..e806d4a3246 100644
--- a/tests/ui/consts/const-eval/promoted_errors.rs
+++ b/tests/ui/consts/const-eval/promoted_errors.rs
@@ -1,10 +1,10 @@
-// revisions: noopt opt opt_with_overflow_checks
-//[noopt]compile-flags: -C opt-level=0
-//[opt]compile-flags: -O
-//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+//@ revisions: noopt opt opt_with_overflow_checks
+//@[noopt]compile-flags: -C opt-level=0
+//@[opt]compile-flags: -O
+//@[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
 
-// build-pass
-// ignore-pass (test emits codegen-time warnings and verifies that they are not errors)
+//@ build-pass
+//@ ignore-pass (test emits codegen-time warnings and verifies that they are not errors)
 
 //! This test ensures that when we promote code that fails to evaluate, the build still succeeds.
 
diff --git a/tests/ui/consts/const-eval/raw-bytes.rs b/tests/ui/consts/const-eval/raw-bytes.rs
index ae65a5cb8df..96903b322e4 100644
--- a/tests/ui/consts/const-eval/raw-bytes.rs
+++ b/tests/ui/consts/const-eval/raw-bytes.rs
@@ -1,7 +1,7 @@
-// stderr-per-bitwidth
-// ignore-endian-big
+//@ stderr-per-bitwidth
+//@ ignore-endian-big
 // ignore-tidy-linelength
-// normalize-stderr-test "╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼" -> "╾ALLOC_ID$1╼"
+//@ normalize-stderr-test "╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼" -> "╾ALLOC_ID$1╼"
 
 #![feature(never_type, rustc_attrs, ptr_metadata, slice_from_ptr_range, const_slice_from_ptr_range)]
 #![allow(invalid_value)]
diff --git a/tests/ui/consts/const-eval/ref_to_int_match.rs b/tests/ui/consts/const-eval/ref_to_int_match.rs
index a2dabde25bc..c627ad97bb0 100644
--- a/tests/ui/consts/const-eval/ref_to_int_match.rs
+++ b/tests/ui/consts/const-eval/ref_to_int_match.rs
@@ -1,4 +1,4 @@
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 
 fn main() {
     let n: Int = 40;
diff --git a/tests/ui/consts/const-eval/simd/insert_extract.rs b/tests/ui/consts/const-eval/simd/insert_extract.rs
index 3472c05d12f..c0113904edf 100644
--- a/tests/ui/consts/const-eval/simd/insert_extract.rs
+++ b/tests/ui/consts/const-eval/simd/insert_extract.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
 #![feature(staged_api)]
diff --git a/tests/ui/consts/const-eval/simple_with_undef.rs b/tests/ui/consts/const-eval/simple_with_undef.rs
index 1a416dd460d..990db4b29d7 100644
--- a/tests/ui/consts/const-eval/simple_with_undef.rs
+++ b/tests/ui/consts/const-eval/simple_with_undef.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const PARSE_BOOL: Option<&'static str> = None;
 static FOO: (Option<&str>, u32) = (PARSE_BOOL, 42);
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-fn-call.rs b/tests/ui/consts/const-eval/stable-metric/ctfe-fn-call.rs
index a30518170ad..1e91f2c86fd 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-fn-call.rs
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-fn-call.rs
@@ -1,5 +1,5 @@
-// check-fail
-// compile-flags: -Z tiny-const-eval-limit
+//@ check-fail
+//@ compile-flags: -Z tiny-const-eval-limit
 
 const fn foo() {}
 
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-labelled-loop.rs b/tests/ui/consts/const-eval/stable-metric/ctfe-labelled-loop.rs
index f7cd04568be..602ca87d4cf 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-labelled-loop.rs
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-labelled-loop.rs
@@ -1,5 +1,5 @@
-// check-fail
-// compile-flags: -Z tiny-const-eval-limit
+//@ check-fail
+//@ compile-flags: -Z tiny-const-eval-limit
 
 const fn labelled_loop(n: u32) -> u32 {
     let mut i = 0;
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-recursion.rs b/tests/ui/consts/const-eval/stable-metric/ctfe-recursion.rs
index 56a39fc45b0..6570357063b 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-recursion.rs
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-recursion.rs
@@ -1,5 +1,5 @@
-// check-fail
-// compile-flags: -Z tiny-const-eval-limit
+//@ check-fail
+//@ compile-flags: -Z tiny-const-eval-limit
 
 #[rustfmt::skip]
 const fn recurse(n: u32) -> u32 {
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs
index 214f33dfb36..42b93383c2b 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs
@@ -1,9 +1,9 @@
-// check-pass
-// revisions: warn allow
+//@ check-pass
+//@ revisions: warn allow
 #![cfg_attr(warn, warn(long_running_const_eval))]
 #![cfg_attr(allow, allow(long_running_const_eval))]
 
-// compile-flags: -Z tiny-const-eval-limit
+//@ compile-flags: -Z tiny-const-eval-limit
 const fn simple_loop(n: u32) -> u32 {
     let mut index = 0;
     while index < n {
diff --git a/tests/ui/consts/const-eval/stable-metric/dominators-edge-case.rs b/tests/ui/consts/const-eval/stable-metric/dominators-edge-case.rs
index 0b0f361809f..d87cf6b18d7 100644
--- a/tests/ui/consts/const-eval/stable-metric/dominators-edge-case.rs
+++ b/tests/ui/consts/const-eval/stable-metric/dominators-edge-case.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 //
 // Exercising an edge case which was found during Stage 2 compilation.
 // Compilation would fail for this code when running the `CtfeLimit`
diff --git a/tests/ui/consts/const-eval/strlen.rs b/tests/ui/consts/const-eval/strlen.rs
index 7b14a523543..4ceb3b82ab3 100644
--- a/tests/ui/consts/const-eval/strlen.rs
+++ b/tests/ui/consts/const-eval/strlen.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const S: &str = "foo";
 pub const B: &[u8] = S.as_bytes();
diff --git a/tests/ui/consts/const-eval/transmute-const.rs b/tests/ui/consts/const-eval/transmute-const.rs
index d9d0a3aea07..bf25b52ed66 100644
--- a/tests/ui/consts/const-eval/transmute-const.rs
+++ b/tests/ui/consts/const-eval/transmute-const.rs
@@ -1,4 +1,4 @@
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 use std::mem;
 
 static FOO: bool = unsafe { mem::transmute(3u8) };
diff --git a/tests/ui/consts/const-eval/ub-enum.rs b/tests/ui/consts/const-eval/ub-enum.rs
index c11ace612f1..71d450c014f 100644
--- a/tests/ui/consts/const-eval/ub-enum.rs
+++ b/tests/ui/consts/const-eval/ub-enum.rs
@@ -1,7 +1,7 @@
 // Strip out raw byte dumps to make comparison platform-independent:
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
-// normalize-stderr-test "0x0+" -> "0x0"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "0x0+" -> "0x0"
 #![feature(never_type)]
 #![allow(invalid_value)]
 
diff --git a/tests/ui/consts/const-eval/ub-incorrect-vtable.rs b/tests/ui/consts/const-eval/ub-incorrect-vtable.rs
index 7d1927253f2..11c3b2fe560 100644
--- a/tests/ui/consts/const-eval/ub-incorrect-vtable.rs
+++ b/tests/ui/consts/const-eval/ub-incorrect-vtable.rs
@@ -10,7 +10,7 @@
 // ICEs as tracked by #86193. So we also use the transparent wrapper to verify proper validation
 // errors are emitted instead of ICEs.
 
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 
 
 trait Trait {}
diff --git a/tests/ui/consts/const-eval/ub-nonnull.rs b/tests/ui/consts/const-eval/ub-nonnull.rs
index fe4ec4d23d0..229ce9a7df3 100644
--- a/tests/ui/consts/const-eval/ub-nonnull.rs
+++ b/tests/ui/consts/const-eval/ub-nonnull.rs
@@ -1,6 +1,6 @@
 // Strip out raw byte dumps to make comparison platform-independent:
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(rustc_attrs, ptr_metadata)]
 #![allow(invalid_value)] // make sure we cannot allow away the errors tested here
 
diff --git a/tests/ui/consts/const-eval/ub-ref-ptr.rs b/tests/ui/consts/const-eval/ub-ref-ptr.rs
index 9e49e3de8bc..78dcd1c1f42 100644
--- a/tests/ui/consts/const-eval/ub-ref-ptr.rs
+++ b/tests/ui/consts/const-eval/ub-ref-ptr.rs
@@ -1,7 +1,7 @@
 // ignore-tidy-linelength
 // Strip out raw byte dumps to make comparison platform-independent:
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![allow(invalid_value)]
 
 use std::mem;
diff --git a/tests/ui/consts/const-eval/ub-slice-get-unchecked.rs b/tests/ui/consts/const-eval/ub-slice-get-unchecked.rs
index ebc5543b380..3800abddd42 100644
--- a/tests/ui/consts/const-eval/ub-slice-get-unchecked.rs
+++ b/tests/ui/consts/const-eval/ub-slice-get-unchecked.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 
 #![feature(const_slice_index)]
 
diff --git a/tests/ui/consts/const-eval/ub-uninhabit.rs b/tests/ui/consts/const-eval/ub-uninhabit.rs
index 0eb9ab415d7..cd29c22262b 100644
--- a/tests/ui/consts/const-eval/ub-uninhabit.rs
+++ b/tests/ui/consts/const-eval/ub-uninhabit.rs
@@ -1,6 +1,6 @@
 // Strip out raw byte dumps to make comparison platform-independent:
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(core_intrinsics)]
 #![feature(never_type)]
 
diff --git a/tests/ui/consts/const-eval/ub-upvars.rs b/tests/ui/consts/const-eval/ub-upvars.rs
index ceac5987031..817511180be 100644
--- a/tests/ui/consts/const-eval/ub-upvars.rs
+++ b/tests/ui/consts/const-eval/ub-upvars.rs
@@ -1,4 +1,4 @@
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 #![allow(invalid_value)] // make sure we cannot allow away the errors tested here
 
 use std::mem;
diff --git a/tests/ui/consts/const-eval/ub-wide-ptr.rs b/tests/ui/consts/const-eval/ub-wide-ptr.rs
index 3c1baab3e48..4c90d1c9840 100644
--- a/tests/ui/consts/const-eval/ub-wide-ptr.rs
+++ b/tests/ui/consts/const-eval/ub-wide-ptr.rs
@@ -4,10 +4,10 @@
 use std::mem;
 
 // Strip out raw byte dumps to make comparison platform-independent:
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
-// normalize-stderr-test "offset \d+" -> "offset N"
-// normalize-stderr-test "size \d+" -> "size N"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "offset \d+" -> "offset N"
+//@ normalize-stderr-test "size \d+" -> "size N"
 
 
 /// A newtype wrapper to prevent MIR generation from inserting reborrows that would affect the error
diff --git a/tests/ui/consts/const-eval/union-ice.rs b/tests/ui/consts/const-eval/union-ice.rs
index dd970a35562..1db9470912d 100644
--- a/tests/ui/consts/const-eval/union-ice.rs
+++ b/tests/ui/consts/const-eval/union-ice.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 type Field1 = i32;
 type Field3 = i64;
diff --git a/tests/ui/consts/const-eval/union-ub.rs b/tests/ui/consts/const-eval/union-ub.rs
index 043870c9c25..5eb4ad4b47f 100644
--- a/tests/ui/consts/const-eval/union-ub.rs
+++ b/tests/ui/consts/const-eval/union-ub.rs
@@ -1,4 +1,4 @@
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 
 #[repr(C)]
 union DummyUnion {
diff --git a/tests/ui/consts/const-eval/unused-broken-const-late.rs b/tests/ui/consts/const-eval/unused-broken-const-late.rs
index a6528ec5fd6..c4916061f9e 100644
--- a/tests/ui/consts/const-eval/unused-broken-const-late.rs
+++ b/tests/ui/consts/const-eval/unused-broken-const-late.rs
@@ -1,5 +1,5 @@
-// build-fail
-// compile-flags: -O
+//@ build-fail
+//@ compile-flags: -O
 //! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
 //! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
 
diff --git a/tests/ui/consts/const-eval/unused-broken-const.rs b/tests/ui/consts/const-eval/unused-broken-const.rs
index 0d2776bc2e3..f7e229aa980 100644
--- a/tests/ui/consts/const-eval/unused-broken-const.rs
+++ b/tests/ui/consts/const-eval/unused-broken-const.rs
@@ -1,6 +1,6 @@
 // make sure that an *unused* broken const triggers an error even in a check build
 
-// compile-flags: --emit=dep-info,metadata
+//@ compile-flags: --emit=dep-info,metadata
 
 const FOO: i32 = [][0];
 //~^ ERROR evaluation of constant value failed
diff --git a/tests/ui/consts/const-eval/valid-const.rs b/tests/ui/consts/const-eval/valid-const.rs
index 5f47d1c4f5c..1c8c048ae28 100644
--- a/tests/ui/consts/const-eval/valid-const.rs
+++ b/tests/ui/consts/const-eval/valid-const.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // Some constants that *are* valid
 
diff --git a/tests/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs b/tests/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
index cccb7879fc0..5628ae1be36 100644
--- a/tests/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
+++ b/tests/ui/consts/const-eval/write-to-uninhabited-enum-variant.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/consts/const-eval/zst_operand_eval.rs b/tests/ui/consts/const-eval/zst_operand_eval.rs
index 5f7ddf7f758..e2892722e89 100644
--- a/tests/ui/consts/const-eval/zst_operand_eval.rs
+++ b/tests/ui/consts/const-eval/zst_operand_eval.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 static ASSERT: () = [()][!(std::mem::size_of::<u32>() == 4) as usize];
 
diff --git a/tests/ui/consts/const-expr-addr-operator.rs b/tests/ui/consts/const-expr-addr-operator.rs
index 37bf24c2fbe..f5f459bbd3e 100644
--- a/tests/ui/consts/const-expr-addr-operator.rs
+++ b/tests/ui/consts/const-expr-addr-operator.rs
@@ -1,5 +1,5 @@
 // Encountered while testing #44614.
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 pub fn main() {
     // Constant of generic type (int)
diff --git a/tests/ui/consts/const-expr-in-fixed-length-vec.rs b/tests/ui/consts/const-expr-in-fixed-length-vec.rs
index a9960b4552b..60b4895f5f9 100644
--- a/tests/ui/consts/const-expr-in-fixed-length-vec.rs
+++ b/tests/ui/consts/const-expr-in-fixed-length-vec.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 // Check that constant expressions can be used for declaring the
 // type of a fixed length vector.
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 pub fn main() {
 
diff --git a/tests/ui/consts/const-expr-in-vec-repeat.rs b/tests/ui/consts/const-expr-in-vec-repeat.rs
index 4eaef25059b..5345a1c4c42 100644
--- a/tests/ui/consts/const-expr-in-vec-repeat.rs
+++ b/tests/ui/consts/const-expr-in-vec-repeat.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 // Check that constant expressions can be used in vec repeat syntax.
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 pub fn main() {
 
diff --git a/tests/ui/consts/const-extern-fn/const-extern-fn.rs b/tests/ui/consts/const-extern-fn/const-extern-fn.rs
index 2ce2eafd545..57f5da8d0af 100644
--- a/tests/ui/consts/const-extern-fn/const-extern-fn.rs
+++ b/tests/ui/consts/const-extern-fn/const-extern-fn.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(const_extern_fn)]
 
 const extern "C" fn foo1(val: u8) -> u8 {
diff --git a/tests/ui/consts/const-extern-function.rs b/tests/ui/consts/const-extern-function.rs
index 01f487a7d75..acc438189cb 100644
--- a/tests/ui/consts/const-extern-function.rs
+++ b/tests/ui/consts/const-extern-function.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 extern "C" fn foopy() {}
diff --git a/tests/ui/consts/const-external-macro-const-err.rs b/tests/ui/consts/const-external-macro-const-err.rs
index 5bd84330bb7..3cb83823f1a 100644
--- a/tests/ui/consts/const-external-macro-const-err.rs
+++ b/tests/ui/consts/const-external-macro-const-err.rs
@@ -1,5 +1,5 @@
-// edition:2018
-// aux-build:external_macro.rs
+//@ edition:2018
+//@ aux-build:external_macro.rs
 
 // Ensure that CONST_ERR lint errors
 // are not silenced in external macros.
diff --git a/tests/ui/consts/const-fields-and-indexing.rs b/tests/ui/consts/const-fields-and-indexing.rs
index bb13bebf4e2..5dd168c565c 100644
--- a/tests/ui/consts/const-fields-and-indexing.rs
+++ b/tests/ui/consts/const-fields-and-indexing.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/const-float-bits-conv.rs b/tests/ui/consts/const-float-bits-conv.rs
index fd5e42ef170..ba8db4c23dc 100644
--- a/tests/ui/consts/const-float-bits-conv.rs
+++ b/tests/ui/consts/const-float-bits-conv.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zmir-opt-level=0
-// run-pass
+//@ compile-flags: -Zmir-opt-level=0
+//@ run-pass
 
 #![feature(const_float_bits_conv)]
 #![feature(const_float_classify)]
diff --git a/tests/ui/consts/const-float-bits-reject-conv.rs b/tests/ui/consts/const-float-bits-reject-conv.rs
index c77e99abbf6..febb272869a 100644
--- a/tests/ui/consts/const-float-bits-reject-conv.rs
+++ b/tests/ui/consts/const-float-bits-reject-conv.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zmir-opt-level=0
-// error-pattern: cannot use f32::to_bits on a NaN
+//@ compile-flags: -Zmir-opt-level=0
+//@ error-pattern: cannot use f32::to_bits on a NaN
 #![feature(const_float_bits_conv)]
 #![feature(const_float_classify)]
 
diff --git a/tests/ui/consts/const-float-classify.rs b/tests/ui/consts/const-float-classify.rs
index e8bd095ed25..44772fb7313 100644
--- a/tests/ui/consts/const-float-classify.rs
+++ b/tests/ui/consts/const-float-classify.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zmir-opt-level=0
-// run-pass
+//@ compile-flags: -Zmir-opt-level=0
+//@ run-pass
 
 #![feature(const_float_bits_conv)]
 #![feature(const_float_classify)]
diff --git a/tests/ui/consts/const-fn-const-eval.rs b/tests/ui/consts/const-fn-const-eval.rs
index d4da990812e..25abca0fb43 100644
--- a/tests/ui/consts/const-fn-const-eval.rs
+++ b/tests/ui/consts/const-fn-const-eval.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 const fn add(x: usize, y: usize) -> usize {
diff --git a/tests/ui/consts/const-fn-destructuring-arg.rs b/tests/ui/consts/const-fn-destructuring-arg.rs
index ea5c9ddc7ce..c775155a96e 100644
--- a/tests/ui/consts/const-fn-destructuring-arg.rs
+++ b/tests/ui/consts/const-fn-destructuring-arg.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const fn i((a, b): (u32, u32)) -> u32 {
     a + b
diff --git a/tests/ui/consts/const-fn-method.rs b/tests/ui/consts/const-fn-method.rs
index 002646db92a..689b8576e4b 100644
--- a/tests/ui/consts/const-fn-method.rs
+++ b/tests/ui/consts/const-fn-method.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Foo { value: u32 }
 
diff --git a/tests/ui/consts/const-fn-nested.rs b/tests/ui/consts/const-fn-nested.rs
index ef5598bf9e7..d0edb51cb6a 100644
--- a/tests/ui/consts/const-fn-nested.rs
+++ b/tests/ui/consts/const-fn-nested.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Test a call whose argument is the result of another call.
 
 const fn sub(x: u32, y: u32) -> u32 {
diff --git a/tests/ui/consts/const-fn-stability-calls-3.rs b/tests/ui/consts/const-fn-stability-calls-3.rs
index b831dee580c..7a9576f1f9d 100644
--- a/tests/ui/consts/const-fn-stability-calls-3.rs
+++ b/tests/ui/consts/const-fn-stability-calls-3.rs
@@ -1,7 +1,7 @@
 // Test use of const fn from another crate without a feature gate.
 
-// check-pass
-// aux-build:const_fn_lib.rs
+//@ check-pass
+//@ aux-build:const_fn_lib.rs
 
 extern crate const_fn_lib;
 
diff --git a/tests/ui/consts/const-fn-stability-calls.rs b/tests/ui/consts/const-fn-stability-calls.rs
index 13867904895..b307c788a4c 100644
--- a/tests/ui/consts/const-fn-stability-calls.rs
+++ b/tests/ui/consts/const-fn-stability-calls.rs
@@ -1,9 +1,9 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Test use of const fn from another crate without a feature gate.
 
-// aux-build:const_fn_lib.rs
+//@ aux-build:const_fn_lib.rs
 
 extern crate const_fn_lib;
 
diff --git a/tests/ui/consts/const-fn-type-name-any.rs b/tests/ui/consts/const-fn-type-name-any.rs
index 448c4fc0446..309fb79f060 100644
--- a/tests/ui/consts/const-fn-type-name-any.rs
+++ b/tests/ui/consts/const-fn-type-name-any.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_type_name)]
 #![allow(dead_code)]
diff --git a/tests/ui/consts/const-fn-type-name.rs b/tests/ui/consts/const-fn-type-name.rs
index fd4f60cb889..5403c26b979 100644
--- a/tests/ui/consts/const-fn-type-name.rs
+++ b/tests/ui/consts/const-fn-type-name.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(core_intrinsics)]
 #![feature(const_type_name)]
diff --git a/tests/ui/consts/const-fn-val.rs b/tests/ui/consts/const-fn-val.rs
index e5bf4757e3a..9c0771bdd0c 100644
--- a/tests/ui/consts/const-fn-val.rs
+++ b/tests/ui/consts/const-fn-val.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 #![allow(overflowing_literals)]
 
diff --git a/tests/ui/consts/const-fn-zst-args.rs b/tests/ui/consts/const-fn-zst-args.rs
index 82c27b37573..27ee42460d2 100644
--- a/tests/ui/consts/const-fn-zst-args.rs
+++ b/tests/ui/consts/const-fn-zst-args.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 // Check that the evaluation of const-functions with
 // zero-sized types as arguments compiles successfully
diff --git a/tests/ui/consts/const-fn.rs b/tests/ui/consts/const-fn.rs
index 59680e6e4a8..aa9c478ea63 100644
--- a/tests/ui/consts/const-fn.rs
+++ b/tests/ui/consts/const-fn.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(stable_features)]
 
 // A very basic test of const fn functionality.
diff --git a/tests/ui/consts/const-index-feature-gate.rs b/tests/ui/consts/const-index-feature-gate.rs
index 3537a1790cc..d13a0b00d80 100644
--- a/tests/ui/consts/const-index-feature-gate.rs
+++ b/tests/ui/consts/const-index-feature-gate.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 const ARR: [usize; 1] = [2];
 const ARR2: [i32; ARR[0]] = [5, 6];
diff --git a/tests/ui/consts/const-int-arithmetic-overflow.rs b/tests/ui/consts/const-int-arithmetic-overflow.rs
index 6446e94513c..17fe6513eee 100644
--- a/tests/ui/consts/const-int-arithmetic-overflow.rs
+++ b/tests/ui/consts/const-int-arithmetic-overflow.rs
@@ -1,5 +1,5 @@
-// run-pass
-// compile-flags: -O
+//@ run-pass
+//@ compile-flags: -O
 
 // Make sure arithmetic unary/binary ops actually return the right result, even when overflowing.
 // We have to put them in `const fn` and turn on optimizations to avoid overflow checks.
diff --git a/tests/ui/consts/const-int-arithmetic.rs b/tests/ui/consts/const-int-arithmetic.rs
index b9096648f92..1c73a76284a 100644
--- a/tests/ui/consts/const-int-arithmetic.rs
+++ b/tests/ui/consts/const-int-arithmetic.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 macro_rules! suite {
     ($(
diff --git a/tests/ui/consts/const-int-conversion-rpass.rs b/tests/ui/consts/const-int-conversion-rpass.rs
index 4aaeeaa3885..b1cd9f19490 100644
--- a/tests/ui/consts/const-int-conversion-rpass.rs
+++ b/tests/ui/consts/const-int-conversion-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const REVERSE: u32 = 0x12345678_u32.reverse_bits();
 const FROM_BE_BYTES: i32 = i32::from_be_bytes([0x12, 0x34, 0x56, 0x78]);
diff --git a/tests/ui/consts/const-int-overflowing-rpass.rs b/tests/ui/consts/const-int-overflowing-rpass.rs
index 75e77fdf1be..1eaeffc4a3b 100644
--- a/tests/ui/consts/const-int-overflowing-rpass.rs
+++ b/tests/ui/consts/const-int-overflowing-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const ADD_A: (u32, bool) = 5u32.overflowing_add(2);
 const ADD_B: (u32, bool) = u32::MAX.overflowing_add(1);
diff --git a/tests/ui/consts/const-int-pow-rpass.rs b/tests/ui/consts/const-int-pow-rpass.rs
index 30bcb78bcf2..df97f326f89 100644
--- a/tests/ui/consts/const-int-pow-rpass.rs
+++ b/tests/ui/consts/const-int-pow-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(wrapping_next_power_of_two)]
 
diff --git a/tests/ui/consts/const-int-rotate-rpass.rs b/tests/ui/consts/const-int-rotate-rpass.rs
index 14f34f76cea..c149794a2bd 100644
--- a/tests/ui/consts/const-int-rotate-rpass.rs
+++ b/tests/ui/consts/const-int-rotate-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const LEFT: u32 = 0x10000b3u32.rotate_left(8);
 const RIGHT: u32 = 0xb301u32.rotate_right(8);
diff --git a/tests/ui/consts/const-int-saturating-arith.rs b/tests/ui/consts/const-int-saturating-arith.rs
index 7edbdd4cec5..3e0f0e76e42 100644
--- a/tests/ui/consts/const-int-saturating-arith.rs
+++ b/tests/ui/consts/const-int-saturating-arith.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const INT_U32_NO: u32 = (42 as u32).saturating_add(2);
 const INT_U32: u32 = u32::MAX.saturating_add(1);
diff --git a/tests/ui/consts/const-int-sign-rpass.rs b/tests/ui/consts/const-int-sign-rpass.rs
index 63c191d4227..04664e57393 100644
--- a/tests/ui/consts/const-int-sign-rpass.rs
+++ b/tests/ui/consts/const-int-sign-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const NEGATIVE_A: bool = (-10i32).is_negative();
 const NEGATIVE_B: bool = 10i32.is_negative();
diff --git a/tests/ui/consts/const-int-wrapping-rpass.rs b/tests/ui/consts/const-int-wrapping-rpass.rs
index 225d1e9393d..f982e417e5f 100644
--- a/tests/ui/consts/const-int-wrapping-rpass.rs
+++ b/tests/ui/consts/const-int-wrapping-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const ADD_A: u32 = 200u32.wrapping_add(55);
 const ADD_B: u32 = 200u32.wrapping_add(u32::MAX);
diff --git a/tests/ui/consts/const-labeled-break.rs b/tests/ui/consts/const-labeled-break.rs
index 6864f7247ad..16444dfefe2 100644
--- a/tests/ui/consts/const-labeled-break.rs
+++ b/tests/ui/consts/const-labeled-break.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Using labeled break in a while loop has caused an illegal instruction being
 // generated, and an ICE later.
diff --git a/tests/ui/consts/const-len-underflow-separate-spans.rs b/tests/ui/consts/const-len-underflow-separate-spans.rs
index bd37be21576..42314eed7aa 100644
--- a/tests/ui/consts/const-len-underflow-separate-spans.rs
+++ b/tests/ui/consts/const-len-underflow-separate-spans.rs
@@ -2,8 +2,8 @@
 // spot (where the underflow occurred), while also providing the
 // overall context for what caused the evaluation.
 
-// revisions: old next
-//[next] compile-flags: -Znext-solver
+//@ revisions: old next
+//@[next] compile-flags: -Znext-solver
 
 const ONE: usize = 1;
 const TWO: usize = 2;
diff --git a/tests/ui/consts/const-match-check.rs b/tests/ui/consts/const-match-check.rs
index 60f60fa40e3..f544b5fa99e 100644
--- a/tests/ui/consts/const-match-check.rs
+++ b/tests/ui/consts/const-match-check.rs
@@ -1,4 +1,4 @@
-// revisions: matchck eval1 eval2
+//@ revisions: matchck eval1 eval2
 
 #[cfg(matchck)]
 const X: i32 = { let 0 = 0; 0 };
diff --git a/tests/ui/consts/const-match-pattern-arm.rs b/tests/ui/consts/const-match-pattern-arm.rs
index 90680c0194c..27af3cf0915 100644
--- a/tests/ui/consts/const-match-pattern-arm.rs
+++ b/tests/ui/consts/const-match-pattern-arm.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const _: bool = match Some(true) {
     Some(value) => true,
diff --git a/tests/ui/consts/const-meth-pattern.rs b/tests/ui/consts/const-meth-pattern.rs
index 1544d760a13..72de172222f 100644
--- a/tests/ui/consts/const-meth-pattern.rs
+++ b/tests/ui/consts/const-meth-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct A;
 
diff --git a/tests/ui/consts/const-mut-refs/const_mut_address_of.rs b/tests/ui/consts/const-mut-refs/const_mut_address_of.rs
index 03b2f9e3c74..66a4ec50c11 100644
--- a/tests/ui/consts/const-mut-refs/const_mut_address_of.rs
+++ b/tests/ui/consts/const-mut-refs/const_mut_address_of.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![feature(const_mut_refs)]
 #![feature(raw_ref_op)]
 
diff --git a/tests/ui/consts/const-mut-refs/const_mut_refs.rs b/tests/ui/consts/const-mut-refs/const_mut_refs.rs
index 96321a1defd..e4a2b78f115 100644
--- a/tests/ui/consts/const-mut-refs/const_mut_refs.rs
+++ b/tests/ui/consts/const-mut-refs/const_mut_refs.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![feature(const_mut_refs)]
 
 use std::sync::Mutex;
diff --git a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
index 19f0ad8a5a4..bd4a9863c74 100644
--- a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
@@ -1,6 +1,6 @@
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
-// normalize-stderr-test "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
+//@ normalize-stderr-test "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
 #![feature(const_mut_refs, const_refs_to_static)]
 #![feature(raw_ref_op)]
 
diff --git a/tests/ui/consts/const-needs_drop.rs b/tests/ui/consts/const-needs_drop.rs
index bf622e38939..a5300fc2ce3 100644
--- a/tests/ui/consts/const-needs_drop.rs
+++ b/tests/ui/consts/const-needs_drop.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::mem;
 
diff --git a/tests/ui/consts/const-negation.rs b/tests/ui/consts/const-negation.rs
index 18bcdfb0130..ef9b21cc553 100644
--- a/tests/ui/consts/const-negation.rs
+++ b/tests/ui/consts/const-negation.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(overflowing_literals)]
 
 fn main() {
diff --git a/tests/ui/consts/const-negative.rs b/tests/ui/consts/const-negative.rs
index 1cb56093628..96a271add1e 100644
--- a/tests/ui/consts/const-negative.rs
+++ b/tests/ui/consts/const-negative.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Issue #358
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/const-nullary-enum.rs b/tests/ui/consts/const-nullary-enum.rs
index b6574dce6ca..f43e889e601 100644
--- a/tests/ui/consts/const-nullary-enum.rs
+++ b/tests/ui/consts/const-nullary-enum.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum Foo {
diff --git a/tests/ui/consts/const-nullary-univariant-enum.rs b/tests/ui/consts/const-nullary-univariant-enum.rs
index 51349ad3195..64385479cbf 100644
--- a/tests/ui/consts/const-nullary-univariant-enum.rs
+++ b/tests/ui/consts/const-nullary-univariant-enum.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #[derive(Copy, Clone)]
 enum Foo {
diff --git a/tests/ui/consts/const-pattern-not-const-evaluable.rs b/tests/ui/consts/const-pattern-not-const-evaluable.rs
index dae5343fe30..3cc0542e500 100644
--- a/tests/ui/consts/const-pattern-not-const-evaluable.rs
+++ b/tests/ui/consts/const-pattern-not-const-evaluable.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 #[derive(PartialEq, Eq)]
 enum Cake {
diff --git a/tests/ui/consts/const-pattern-variant.rs b/tests/ui/consts/const-pattern-variant.rs
index 80f749ed72d..17f7b70dd59 100644
--- a/tests/ui/consts/const-pattern-variant.rs
+++ b/tests/ui/consts/const-pattern-variant.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unreachable_patterns)]
 
 #[derive(PartialEq, Eq)]
diff --git a/tests/ui/consts/const-ptr-nonnull-rpass.rs b/tests/ui/consts/const-ptr-nonnull-rpass.rs
index 67d52ad0824..48ad72df630 100644
--- a/tests/ui/consts/const-ptr-nonnull-rpass.rs
+++ b/tests/ui/consts/const-ptr-nonnull-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(ptr_internals, test)]
 
diff --git a/tests/ui/consts/const-ptr-unique-rpass.rs b/tests/ui/consts/const-ptr-unique-rpass.rs
index fc13bb98bd2..db319b6ab92 100644
--- a/tests/ui/consts/const-ptr-unique-rpass.rs
+++ b/tests/ui/consts/const-ptr-unique-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(ptr_internals, test)]
 
diff --git a/tests/ui/consts/const-rec-and-tup.rs b/tests/ui/consts/const-rec-and-tup.rs
index 0bddaf75de8..03cc444a86b 100644
--- a/tests/ui/consts/const-rec-and-tup.rs
+++ b/tests/ui/consts/const-rec-and-tup.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 #![allow(overflowing_literals)]
diff --git a/tests/ui/consts/const-region-ptrs-noncopy.rs b/tests/ui/consts/const-region-ptrs-noncopy.rs
index 10b9ce896a6..84695eb5fa6 100644
--- a/tests/ui/consts/const-region-ptrs-noncopy.rs
+++ b/tests/ui/consts/const-region-ptrs-noncopy.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/const-region-ptrs.rs b/tests/ui/consts/const-region-ptrs.rs
index 9b94a2b1121..0fd8f4292d9 100644
--- a/tests/ui/consts/const-region-ptrs.rs
+++ b/tests/ui/consts/const-region-ptrs.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 struct Pair<'a> { a: isize, b: &'a isize }
diff --git a/tests/ui/consts/const-repeated-values.rs b/tests/ui/consts/const-repeated-values.rs
index 27efb5ba2a2..9ee73bce56d 100644
--- a/tests/ui/consts/const-repeated-values.rs
+++ b/tests/ui/consts/const-repeated-values.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 const FOO: isize = 42;
 
 enum Bar {
diff --git a/tests/ui/consts/const-size_of-align_of.rs b/tests/ui/consts/const-size_of-align_of.rs
index 0c63dc84a37..37f54644622 100644
--- a/tests/ui/consts/const-size_of-align_of.rs
+++ b/tests/ui/consts/const-size_of-align_of.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 use std::mem;
diff --git a/tests/ui/consts/const-size_of-cycle.rs b/tests/ui/consts/const-size_of-cycle.rs
index 1f56c8bd8e6..cfb2294c445 100644
--- a/tests/ui/consts/const-size_of-cycle.rs
+++ b/tests/ui/consts/const-size_of-cycle.rs
@@ -1,4 +1,4 @@
-// error-pattern: cycle detected
+//@ error-pattern: cycle detected
 
 struct Foo {
     bytes: [u8; std::mem::size_of::<Foo>()]
diff --git a/tests/ui/consts/const-size_of_val-align_of_val.rs b/tests/ui/consts/const-size_of_val-align_of_val.rs
index cd678176761..ee9dfca0170 100644
--- a/tests/ui/consts/const-size_of_val-align_of_val.rs
+++ b/tests/ui/consts/const-size_of_val-align_of_val.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_size_of_val, const_align_of_val)]
 #![feature(const_size_of_val_raw, const_align_of_val_raw, layout_for_ptr)]
diff --git a/tests/ui/consts/const-struct-offsets.rs b/tests/ui/consts/const-struct-offsets.rs
index 26a00832079..ee97fe3cab9 100644
--- a/tests/ui/consts/const-struct-offsets.rs
+++ b/tests/ui/consts/const-struct-offsets.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 #![allow(non_upper_case_globals)]
 
 enum Foo {
diff --git a/tests/ui/consts/const-struct.rs b/tests/ui/consts/const-struct.rs
index db397a891d6..d11f4ea77c4 100644
--- a/tests/ui/consts/const-struct.rs
+++ b/tests/ui/consts/const-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/const-trait-to-trait.rs b/tests/ui/consts/const-trait-to-trait.rs
index 12a2999d79d..382c7613c9e 100644
--- a/tests/ui/consts/const-trait-to-trait.rs
+++ b/tests/ui/consts/const-trait-to-trait.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Issue #24644 - block causes a &Trait -> &Trait coercion:
diff --git a/tests/ui/consts/const-try.rs b/tests/ui/consts/const-try.rs
index 6b7ba8f1e32..f2d3db9be9c 100644
--- a/tests/ui/consts/const-try.rs
+++ b/tests/ui/consts/const-try.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 
 // Demonstrates what's needed to make use of `?` in const contexts.
 
diff --git a/tests/ui/consts/const-tuple-struct.rs b/tests/ui/consts/const-tuple-struct.rs
index 0144afaaceb..1670faa70e8 100644
--- a/tests/ui/consts/const-tuple-struct.rs
+++ b/tests/ui/consts/const-tuple-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Bar(isize, isize);
 
diff --git a/tests/ui/consts/const-typeid-of-rpass.rs b/tests/ui/consts/const-typeid-of-rpass.rs
index 89d57ae4f98..15ffdd1e83a 100644
--- a/tests/ui/consts/const-typeid-of-rpass.rs
+++ b/tests/ui/consts/const-typeid-of-rpass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(const_type_id)]
 #![feature(core_intrinsics)]
 
diff --git a/tests/ui/consts/const-unit-struct.rs b/tests/ui/consts/const-unit-struct.rs
index 1c9e0e8d3c9..096cd1e8384 100644
--- a/tests/ui/consts/const-unit-struct.rs
+++ b/tests/ui/consts/const-unit-struct.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 struct Foo;
 
diff --git a/tests/ui/consts/const-unsafe-fn.rs b/tests/ui/consts/const-unsafe-fn.rs
index 72ce73f745f..8735f79dda8 100644
--- a/tests/ui/consts/const-unsafe-fn.rs
+++ b/tests/ui/consts/const-unsafe-fn.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // A quick test of 'unsafe const fn' functionality
 
diff --git a/tests/ui/consts/const-unwrap.rs b/tests/ui/consts/const-unwrap.rs
index 729ae535cef..bc79c7db2fc 100644
--- a/tests/ui/consts/const-unwrap.rs
+++ b/tests/ui/consts/const-unwrap.rs
@@ -1,4 +1,4 @@
-// check-fail
+//@ check-fail
 
 #![feature(const_option)]
 
diff --git a/tests/ui/consts/const-validation-fail-55455.rs b/tests/ui/consts/const-validation-fail-55455.rs
index 583074888c9..c2f41c1850a 100644
--- a/tests/ui/consts/const-validation-fail-55455.rs
+++ b/tests/ui/consts/const-validation-fail-55455.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/issues/55454
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 struct This<T>(T);
 
diff --git a/tests/ui/consts/const-variant-count.rs b/tests/ui/consts/const-variant-count.rs
index 50eaeeb4685..c554c3b0ff4 100644
--- a/tests/ui/consts/const-variant-count.rs
+++ b/tests/ui/consts/const-variant-count.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code, enum_intrinsics_non_enums)]
 #![feature(variant_count)]
 #![feature(never_type)]
diff --git a/tests/ui/consts/const-vec-of-fns.rs b/tests/ui/consts/const-vec-of-fns.rs
index 6d90b066b74..a14cb06db61 100644
--- a/tests/ui/consts/const-vec-of-fns.rs
+++ b/tests/ui/consts/const-vec-of-fns.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 #![allow(non_upper_case_globals)]
 
 /*!
diff --git a/tests/ui/consts/const-vec-syntax.rs b/tests/ui/consts/const-vec-syntax.rs
index 61246e44eba..5537a8cec90 100644
--- a/tests/ui/consts/const-vec-syntax.rs
+++ b/tests/ui/consts/const-vec-syntax.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 fn f(_: &[isize]) {}
 
diff --git a/tests/ui/consts/const-vecs-and-slices.rs b/tests/ui/consts/const-vecs-and-slices.rs
index 1cdc33b7a34..4ddc5e8a8d8 100644
--- a/tests/ui/consts/const-vecs-and-slices.rs
+++ b/tests/ui/consts/const-vecs-and-slices.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 static x : [isize; 4] = [1,2,3,4];
diff --git a/tests/ui/consts/const.rs b/tests/ui/consts/const.rs
index 71fbadfa828..1f1c6e30b4a 100644
--- a/tests/ui/consts/const.rs
+++ b/tests/ui/consts/const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 static i: isize = 10;
diff --git a/tests/ui/consts/const_cmp_type_id.rs b/tests/ui/consts/const_cmp_type_id.rs
index cda811144c7..f2727142323 100644
--- a/tests/ui/consts/const_cmp_type_id.rs
+++ b/tests/ui/consts/const_cmp_type_id.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 #![feature(const_type_id)]
 #![feature(const_trait_impl, effects)]
 
diff --git a/tests/ui/consts/const_constructor/const-construct-call.rs b/tests/ui/consts/const_constructor/const-construct-call.rs
index cb735d7b305..b875b03f00a 100644
--- a/tests/ui/consts/const_constructor/const-construct-call.rs
+++ b/tests/ui/consts/const_constructor/const-construct-call.rs
@@ -1,6 +1,6 @@
 // Test that constructors are considered to be const fns
 
-// run-pass
+//@ run-pass
 
 // Ctor(..) is transformed to Ctor { 0: ... } in THIR lowering, so directly
 // calling constructors doesn't require them to be const.
diff --git a/tests/ui/consts/const_constructor/const_constructor_qpath.rs b/tests/ui/consts/const_constructor/const_constructor_qpath.rs
index 7c55f470fdf..a0bf5e4eae8 100644
--- a/tests/ui/consts/const_constructor/const_constructor_qpath.rs
+++ b/tests/ui/consts/const_constructor/const_constructor_qpath.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 trait ConstDefault {
     const DEFAULT: Self;
diff --git a/tests/ui/consts/const_discriminant.rs b/tests/ui/consts/const_discriminant.rs
index 80deb0f784d..49d7af1b460 100644
--- a/tests/ui/consts/const_discriminant.rs
+++ b/tests/ui/consts/const_discriminant.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 use std::mem::{discriminant, Discriminant};
diff --git a/tests/ui/consts/const_fn_floating_point_arithmetic.rs b/tests/ui/consts/const_fn_floating_point_arithmetic.rs
index 5e32482b21a..b0d0bc6b9f4 100644
--- a/tests/ui/consts/const_fn_floating_point_arithmetic.rs
+++ b/tests/ui/consts/const_fn_floating_point_arithmetic.rs
@@ -1,6 +1,6 @@
 // gate-test-const_fn_floating_point_arithmetic
 
-// revisions: stock gated
+//@ revisions: stock gated
 
 #![feature(rustc_attrs)]
 #![cfg_attr(gated, feature(const_fn_floating_point_arithmetic))]
diff --git a/tests/ui/consts/const_fn_return_nested_fn_ptr.rs b/tests/ui/consts/const_fn_return_nested_fn_ptr.rs
index d22c789609f..8f705f32ac1 100644
--- a/tests/ui/consts/const_fn_return_nested_fn_ptr.rs
+++ b/tests/ui/consts/const_fn_return_nested_fn_ptr.rs
@@ -1,5 +1,5 @@
-// build-pass (FIXME(62277): could be check-pass?)
-// aux-build:const_fn_lib.rs
+//@ build-pass (FIXME(62277): could be check-pass?)
+//@ aux-build:const_fn_lib.rs
 
 extern crate const_fn_lib;
 
diff --git a/tests/ui/consts/const_fn_unsize.rs b/tests/ui/consts/const_fn_unsize.rs
index 01da57320c2..f96a6088fd3 100644
--- a/tests/ui/consts/const_fn_unsize.rs
+++ b/tests/ui/consts/const_fn_unsize.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(slice_ptr_len)]
 
 use std::ptr::NonNull;
diff --git a/tests/ui/consts/const_forget.rs b/tests/ui/consts/const_forget.rs
index f06149f2cb9..6fc7126af1b 100644
--- a/tests/ui/consts/const_forget.rs
+++ b/tests/ui/consts/const_forget.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![allow(forgetting_copy_types)]
 
diff --git a/tests/ui/consts/const_in_pattern/accept_structural.rs b/tests/ui/consts/const_in_pattern/accept_structural.rs
index 69b4e75c622..09142c56157 100644
--- a/tests/ui/consts/const_in_pattern/accept_structural.rs
+++ b/tests/ui/consts/const_in_pattern/accept_structural.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![warn(indirect_structural_match)]
 
diff --git a/tests/ui/consts/const_in_pattern/cross-crate-fail.rs b/tests/ui/consts/const_in_pattern/cross-crate-fail.rs
index 69f5e66f5af..d8df2847c44 100644
--- a/tests/ui/consts/const_in_pattern/cross-crate-fail.rs
+++ b/tests/ui/consts/const_in_pattern/cross-crate-fail.rs
@@ -1,4 +1,4 @@
-// aux-build:consts.rs
+//@ aux-build:consts.rs
 
 #![warn(indirect_structural_match)]
 
diff --git a/tests/ui/consts/const_in_pattern/cross-crate-pass.rs b/tests/ui/consts/const_in_pattern/cross-crate-pass.rs
index 1d8ecf8ae66..c18a30b3495 100644
--- a/tests/ui/consts/const_in_pattern/cross-crate-pass.rs
+++ b/tests/ui/consts/const_in_pattern/cross-crate-pass.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:consts.rs
+//@ run-pass
+//@ aux-build:consts.rs
 
 #![warn(indirect_structural_match)]
 
diff --git a/tests/ui/consts/const_in_pattern/custom-eq-branch-pass.rs b/tests/ui/consts/const_in_pattern/custom-eq-branch-pass.rs
index ac89b7925ff..605f4e760cd 100644
--- a/tests/ui/consts/const_in_pattern/custom-eq-branch-pass.rs
+++ b/tests/ui/consts/const_in_pattern/custom-eq-branch-pass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![warn(indirect_structural_match)]
 
diff --git a/tests/ui/consts/const_in_pattern/issue-44333.rs b/tests/ui/consts/const_in_pattern/issue-44333.rs
index aaf1edb6fe6..9adf02cbfce 100644
--- a/tests/ui/consts/const_in_pattern/issue-44333.rs
+++ b/tests/ui/consts/const_in_pattern/issue-44333.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![warn(pointer_structural_match)]
 
diff --git a/tests/ui/consts/const_in_pattern/issue-53708.rs b/tests/ui/consts/const_in_pattern/issue-53708.rs
index 355ba63790f..a21afbe7c0d 100644
--- a/tests/ui/consts/const_in_pattern/issue-53708.rs
+++ b/tests/ui/consts/const_in_pattern/issue-53708.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 // https://github.com/rust-lang/rust/issues/53708
 #[derive(PartialEq, Eq)]
 struct S;
diff --git a/tests/ui/consts/const_in_pattern/issue-62614.rs b/tests/ui/consts/const_in_pattern/issue-62614.rs
index 4ea9a283618..92f76322fde 100644
--- a/tests/ui/consts/const_in_pattern/issue-62614.rs
+++ b/tests/ui/consts/const_in_pattern/issue-62614.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Sum(u32, u32);
 
diff --git a/tests/ui/consts/const_in_pattern/issue-65466.rs b/tests/ui/consts/const_in_pattern/issue-65466.rs
index d45c32e170a..048fca762d5 100644
--- a/tests/ui/consts/const_in_pattern/issue-65466.rs
+++ b/tests/ui/consts/const_in_pattern/issue-65466.rs
@@ -1,6 +1,6 @@
 #![deny(indirect_structural_match)]
 
-// check-pass
+//@ check-pass
 
 #[derive(PartialEq, Eq)]
 enum O<T> {
diff --git a/tests/ui/consts/const_in_pattern/issue-73431.rs b/tests/ui/consts/const_in_pattern/issue-73431.rs
index 835f502b407..4e492fc8ea5 100644
--- a/tests/ui/consts/const_in_pattern/issue-73431.rs
+++ b/tests/ui/consts/const_in_pattern/issue-73431.rs
@@ -1,5 +1,5 @@
-// run-pass
-// unset-rustc-env:RUSTC_LOG_COLOR
+//@ run-pass
+//@ unset-rustc-env:RUSTC_LOG_COLOR
 
 // Regression test for https://github.com/rust-lang/rust/issues/73431.
 
diff --git a/tests/ui/consts/const_in_pattern/null-raw-ptr-issue-119270.rs b/tests/ui/consts/const_in_pattern/null-raw-ptr-issue-119270.rs
index 515c79d9457..ae2d532be7b 100644
--- a/tests/ui/consts/const_in_pattern/null-raw-ptr-issue-119270.rs
+++ b/tests/ui/consts/const_in_pattern/null-raw-ptr-issue-119270.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 struct NoDerive(#[allow(dead_code)] i32);
 
 #[derive(PartialEq)]
diff --git a/tests/ui/consts/const_in_pattern/reject_non_structural.rs b/tests/ui/consts/const_in_pattern/reject_non_structural.rs
index 71d4138104d..a9b0aa5507e 100644
--- a/tests/ui/consts/const_in_pattern/reject_non_structural.rs
+++ b/tests/ui/consts/const_in_pattern/reject_non_structural.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zdeduplicate-diagnostics=yes
+//@ compile-flags: -Zdeduplicate-diagnostics=yes
 
 // This test of structural match checking enumerates the different kinds of
 // const definitions, collecting cases where the const pattern is rejected.
diff --git a/tests/ui/consts/const_let_assign.rs b/tests/ui/consts/const_let_assign.rs
index b83acfb73cf..73580c419c0 100644
--- a/tests/ui/consts/const_let_assign.rs
+++ b/tests/ui/consts/const_let_assign.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 struct S(i32);
 
diff --git a/tests/ui/consts/const_let_assign2.rs b/tests/ui/consts/const_let_assign2.rs
index 1c7afe0e3d6..f239507d245 100644
--- a/tests/ui/consts/const_let_assign2.rs
+++ b/tests/ui/consts/const_let_assign2.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub struct AA {
     pub data: [u8; 10],
diff --git a/tests/ui/consts/const_let_eq.rs b/tests/ui/consts/const_let_eq.rs
index 818819f9ff6..cf2a38bf213 100644
--- a/tests/ui/consts/const_let_eq.rs
+++ b/tests/ui/consts/const_let_eq.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Foo<T>(T);
 struct Bar<T> { x: T }
diff --git a/tests/ui/consts/const_let_eq_float.rs b/tests/ui/consts/const_let_eq_float.rs
index e15f4b804f7..30d839cdc2a 100644
--- a/tests/ui/consts/const_let_eq_float.rs
+++ b/tests/ui/consts/const_let_eq_float.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_fn_floating_point_arithmetic)]
 
diff --git a/tests/ui/consts/const_let_irrefutable.rs b/tests/ui/consts/const_let_irrefutable.rs
index e889abf4abe..afd67be7805 100644
--- a/tests/ui/consts/const_let_irrefutable.rs
+++ b/tests/ui/consts/const_let_irrefutable.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 fn main() {}
 
diff --git a/tests/ui/consts/const_let_promote.rs b/tests/ui/consts/const_let_promote.rs
index f4661e9e425..e04cbfc8171 100644
--- a/tests/ui/consts/const_let_promote.rs
+++ b/tests/ui/consts/const_let_promote.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::cell::Cell;
 
diff --git a/tests/ui/consts/const_prop_slice_pat_ice.rs b/tests/ui/consts/const_prop_slice_pat_ice.rs
index 60b06a497d6..edb0c509014 100644
--- a/tests/ui/consts/const_prop_slice_pat_ice.rs
+++ b/tests/ui/consts/const_prop_slice_pat_ice.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 fn main() {
     match &[0, 1] as &[i32] {
diff --git a/tests/ui/consts/const_refs_to_static.rs b/tests/ui/consts/const_refs_to_static.rs
index f5e5ef5f699..1baa8535b2c 100644
--- a/tests/ui/consts/const_refs_to_static.rs
+++ b/tests/ui/consts/const_refs_to_static.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(const_refs_to_static)]
 
 static S: i32 = 0;
diff --git a/tests/ui/consts/const_refs_to_static_fail.rs b/tests/ui/consts/const_refs_to_static_fail.rs
index d5bcccf82d5..e001c4d6395 100644
--- a/tests/ui/consts/const_refs_to_static_fail.rs
+++ b/tests/ui/consts/const_refs_to_static_fail.rs
@@ -1,5 +1,5 @@
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(const_refs_to_static, const_mut_refs, sync_unsafe_cell)]
 use std::cell::SyncUnsafeCell;
 
diff --git a/tests/ui/consts/const_refs_to_static_fail_invalid.rs b/tests/ui/consts/const_refs_to_static_fail_invalid.rs
index 665b876c43e..363a6da0901 100644
--- a/tests/ui/consts/const_refs_to_static_fail_invalid.rs
+++ b/tests/ui/consts/const_refs_to_static_fail_invalid.rs
@@ -1,5 +1,5 @@
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(const_refs_to_static)]
 #![allow(static_mut_ref)]
 
diff --git a/tests/ui/consts/const_short_circuit.rs b/tests/ui/consts/const_short_circuit.rs
index 6403fbb17dd..71788977491 100644
--- a/tests/ui/consts/const_short_circuit.rs
+++ b/tests/ui/consts/const_short_circuit.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const _: bool = false && false;
 const _: bool = true && false;
diff --git a/tests/ui/consts/const_unsafe_unreachable.rs b/tests/ui/consts/const_unsafe_unreachable.rs
index 1c3baec5d86..2f52b48746f 100644
--- a/tests/ui/consts/const_unsafe_unreachable.rs
+++ b/tests/ui/consts/const_unsafe_unreachable.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const unsafe fn foo(x: bool) -> bool {
     match x {
diff --git a/tests/ui/consts/const_unsafe_unreachable_ub.rs b/tests/ui/consts/const_unsafe_unreachable_ub.rs
index b418fea617c..705e208b56d 100644
--- a/tests/ui/consts/const_unsafe_unreachable_ub.rs
+++ b/tests/ui/consts/const_unsafe_unreachable_ub.rs
@@ -1,4 +1,4 @@
-// error-pattern: evaluation of constant value failed
+//@ error-pattern: evaluation of constant value failed
 
 const unsafe fn foo(x: bool) -> bool {
     match x {
diff --git a/tests/ui/consts/constifconst-call-in-const-position.rs b/tests/ui/consts/constifconst-call-in-const-position.rs
index fcf01d5bc71..29c967f38a7 100644
--- a/tests/ui/consts/constifconst-call-in-const-position.rs
+++ b/tests/ui/consts/constifconst-call-in-const-position.rs
@@ -1,4 +1,4 @@
-// known-bug: #102498
+//@ known-bug: #102498
 
 #![feature(const_trait_impl, generic_const_exprs)]
 
diff --git a/tests/ui/consts/consts-in-patterns.rs b/tests/ui/consts/consts-in-patterns.rs
index 0295204c879..31b2f1b2151 100644
--- a/tests/ui/consts/consts-in-patterns.rs
+++ b/tests/ui/consts/consts-in-patterns.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const FOO: isize = 10;
 const BAR: isize = 3;
diff --git a/tests/ui/consts/control-flow/basics.rs b/tests/ui/consts/control-flow/basics.rs
index 02e5501f10c..c4e32e246f0 100644
--- a/tests/ui/consts/control-flow/basics.rs
+++ b/tests/ui/consts/control-flow/basics.rs
@@ -1,6 +1,6 @@
 // Test basic functionality of control flow in a const context.
 
-// run-pass
+//@ run-pass
 
 const X: u32 = 4;
 const Y: u32 = 5;
diff --git a/tests/ui/consts/control-flow/drop-fail.rs b/tests/ui/consts/control-flow/drop-fail.rs
index 41341f3121e..25afe5d08d9 100644
--- a/tests/ui/consts/control-flow/drop-fail.rs
+++ b/tests/ui/consts/control-flow/drop-fail.rs
@@ -1,4 +1,4 @@
-// revisions: stock precise
+//@ revisions: stock precise
 
 #![cfg_attr(precise, feature(const_precise_live_drops))]
 
diff --git a/tests/ui/consts/control-flow/drop-pass.rs b/tests/ui/consts/control-flow/drop-pass.rs
index 2a6d12768c3..69ecb1176d4 100644
--- a/tests/ui/consts/control-flow/drop-pass.rs
+++ b/tests/ui/consts/control-flow/drop-pass.rs
@@ -1,5 +1,5 @@
-// run-pass
-// revisions: stock precise
+//@ run-pass
+//@ revisions: stock precise
 
 #![allow(unused)]
 #![cfg_attr(precise, feature(const_precise_live_drops))]
diff --git a/tests/ui/consts/control-flow/drop-precise.rs b/tests/ui/consts/control-flow/drop-precise.rs
index 4ecc5ef78dd..9f42d335187 100644
--- a/tests/ui/consts/control-flow/drop-precise.rs
+++ b/tests/ui/consts/control-flow/drop-precise.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // gate-test-const_precise_live_drops
 
 #![feature(const_precise_live_drops)]
diff --git a/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs b/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
index 4320133dfdb..fbe16f72f43 100644
--- a/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
+++ b/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
@@ -1,6 +1,6 @@
 // Test for <https://github.com/rust-lang/rust/issues/66756>
 
-// check-pass
+//@ check-pass
 
 enum E {
     A,
diff --git a/tests/ui/consts/control-flow/feature-gate-const-if-match.rs b/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
index cb66bc75309..ccf77b411d5 100644
--- a/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
+++ b/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const _: i32 = if true { 5 } else { 6 };
 
diff --git a/tests/ui/consts/control-flow/short-circuit-let.rs b/tests/ui/consts/control-flow/short-circuit-let.rs
index 8a58d06ac87..2d1a487ee09 100644
--- a/tests/ui/consts/control-flow/short-circuit-let.rs
+++ b/tests/ui/consts/control-flow/short-circuit-let.rs
@@ -1,6 +1,6 @@
 // `&&` and `||` were previously forbidden in constants alongside let bindings.
 
-// run-pass
+//@ run-pass
 
 const X: i32 = {
     let mut x = 0;
diff --git a/tests/ui/consts/control-flow/short-circuit.rs b/tests/ui/consts/control-flow/short-circuit.rs
index 6abe107855f..4437106edf3 100644
--- a/tests/ui/consts/control-flow/short-circuit.rs
+++ b/tests/ui/consts/control-flow/short-circuit.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Test that both `&&` and `||` actually short-circuit.
 // Formerly, both sides were evaluated unconditionally
diff --git a/tests/ui/consts/control-flow/single_variant_match_ice.rs b/tests/ui/consts/control-flow/single_variant_match_ice.rs
index b59be00ffb7..aa0cdc01837 100644
--- a/tests/ui/consts/control-flow/single_variant_match_ice.rs
+++ b/tests/ui/consts/control-flow/single_variant_match_ice.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 enum Foo {
     Prob,
diff --git a/tests/ui/consts/cycle-static-promoted.rs b/tests/ui/consts/cycle-static-promoted.rs
index 5838dc58a3a..d648d048611 100644
--- a/tests/ui/consts/cycle-static-promoted.rs
+++ b/tests/ui/consts/cycle-static-promoted.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 struct Value {
     values: &'static [&'static Value],
diff --git a/tests/ui/consts/deref_in_pattern.rs b/tests/ui/consts/deref_in_pattern.rs
index cc47b5b49c0..eb49a3dc78f 100644
--- a/tests/ui/consts/deref_in_pattern.rs
+++ b/tests/ui/consts/deref_in_pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/25574
 
diff --git a/tests/ui/consts/drop-maybe_uninit.rs b/tests/ui/consts/drop-maybe_uninit.rs
index 2fdeae5f185..91c1c8a9260 100644
--- a/tests/ui/consts/drop-maybe_uninit.rs
+++ b/tests/ui/consts/drop-maybe_uninit.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 pub const fn f<T, const N: usize>(_: [std::mem::MaybeUninit<T>; N]) {}
 
diff --git a/tests/ui/consts/drop_none.rs b/tests/ui/consts/drop_none.rs
index 9d98d3be874..7991f119857 100644
--- a/tests/ui/consts/drop_none.rs
+++ b/tests/ui/consts/drop_none.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 #![allow(dead_code)]
 struct A;
 impl Drop for A {
diff --git a/tests/ui/consts/drop_zst.rs b/tests/ui/consts/drop_zst.rs
index f7c70d3978b..40c66043f9f 100644
--- a/tests/ui/consts/drop_zst.rs
+++ b/tests/ui/consts/drop_zst.rs
@@ -1,4 +1,4 @@
-// check-fail
+//@ check-fail
 
 #![feature(const_precise_live_drops)]
 
diff --git a/tests/ui/consts/extra-const-ub/detect-extra-ub.rs b/tests/ui/consts/extra-const-ub/detect-extra-ub.rs
index 39f918379d1..d2b157e03e7 100644
--- a/tests/ui/consts/extra-const-ub/detect-extra-ub.rs
+++ b/tests/ui/consts/extra-const-ub/detect-extra-ub.rs
@@ -1,6 +1,6 @@
-// revisions: no_flag with_flag
-// [no_flag] check-pass
-// [with_flag] compile-flags: -Zextra-const-ub-checks
+//@ revisions: no_flag with_flag
+//@ [no_flag] check-pass
+//@ [with_flag] compile-flags: -Zextra-const-ub-checks
 #![feature(never_type)]
 
 use std::mem::transmute;
diff --git a/tests/ui/consts/extra-const-ub/issue-100771.rs b/tests/ui/consts/extra-const-ub/issue-100771.rs
index a3296032841..1ae6f25f7b1 100644
--- a/tests/ui/consts/extra-const-ub/issue-100771.rs
+++ b/tests/ui/consts/extra-const-ub/issue-100771.rs
@@ -1,5 +1,5 @@
-// check-pass
-// compile-flags: -Zextra-const-ub-checks
+//@ check-pass
+//@ compile-flags: -Zextra-const-ub-checks
 
 #[derive(PartialEq, Eq, Copy, Clone)]
 #[repr(packed)]
diff --git a/tests/ui/consts/extra-const-ub/issue-101034.rs b/tests/ui/consts/extra-const-ub/issue-101034.rs
index e0de705c488..cb0a0fb0d5b 100644
--- a/tests/ui/consts/extra-const-ub/issue-101034.rs
+++ b/tests/ui/consts/extra-const-ub/issue-101034.rs
@@ -1,5 +1,5 @@
-// check-pass
-// compile-flags: -Zextra-const-ub-checks
+//@ check-pass
+//@ compile-flags: -Zextra-const-ub-checks
 
 #[repr(packed)]
 pub struct Foo {
diff --git a/tests/ui/consts/fn_trait_refs.rs b/tests/ui/consts/fn_trait_refs.rs
index be11ac7264a..e9444e5c094 100644
--- a/tests/ui/consts/fn_trait_refs.rs
+++ b/tests/ui/consts/fn_trait_refs.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 
 #![feature(const_fn_trait_ref_impls)]
 #![feature(fn_traits)]
diff --git a/tests/ui/consts/huge-values.rs b/tests/ui/consts/huge-values.rs
index 70a5b10e9be..e88683ca1dc 100644
--- a/tests/ui/consts/huge-values.rs
+++ b/tests/ui/consts/huge-values.rs
@@ -1,5 +1,5 @@
-// build-pass
-// ignore-32bit
+//@ build-pass
+//@ ignore-32bit
 
 // This test is a canary test that will essentially not compile in a reasonable time frame
 // (so it'll take hours) if any of the optimizations regress. With the optimizations, these compile
diff --git a/tests/ui/consts/ice-48279.rs b/tests/ui/consts/ice-48279.rs
index d1d90df240c..5316974b80a 100644
--- a/tests/ui/consts/ice-48279.rs
+++ b/tests/ui/consts/ice-48279.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_unsafe)]
 
diff --git a/tests/ui/consts/ice-zst-static-access.rs b/tests/ui/consts/ice-zst-static-access.rs
index b68e442a57c..2a4343e3eba 100644
--- a/tests/ui/consts/ice-zst-static-access.rs
+++ b/tests/ui/consts/ice-zst-static-access.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // This is a regression test for ICEs from
 // https://github.com/rust-lang/rust/issues/71612
diff --git a/tests/ui/consts/inline_asm.rs b/tests/ui/consts/inline_asm.rs
index 4cd7e2717fe..20ea6a8e994 100644
--- a/tests/ui/consts/inline_asm.rs
+++ b/tests/ui/consts/inline_asm.rs
@@ -1,4 +1,4 @@
-// needs-asm-support
+//@ needs-asm-support
 
 use std::arch::asm;
 
diff --git a/tests/ui/consts/int_ptr_for_zst_slices.rs b/tests/ui/consts/int_ptr_for_zst_slices.rs
index 34e5bb322be..c6330f4739e 100644
--- a/tests/ui/consts/int_ptr_for_zst_slices.rs
+++ b/tests/ui/consts/int_ptr_for_zst_slices.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const FOO: &str = unsafe { &*(1_usize as *const [u8; 0] as *const [u8] as *const str) };
 
diff --git a/tests/ui/consts/interior-mut-const-via-union.rs b/tests/ui/consts/interior-mut-const-via-union.rs
index 4f67ec97902..20485b90bf7 100644
--- a/tests/ui/consts/interior-mut-const-via-union.rs
+++ b/tests/ui/consts/interior-mut-const-via-union.rs
@@ -1,8 +1,8 @@
 // Check that constants with interior mutability inside unions are rejected
 // during validation.
 //
-// build-fail
-// stderr-per-bitwidth
+//@ build-fail
+//@ stderr-per-bitwidth
 #![feature(const_mut_refs)]
 
 use std::cell::Cell;
diff --git a/tests/ui/consts/invalid_promotion.rs b/tests/ui/consts/invalid_promotion.rs
index a31eaf40e0e..1a92ddf382d 100644
--- a/tests/ui/consts/invalid_promotion.rs
+++ b/tests/ui/consts/invalid_promotion.rs
@@ -1,6 +1,6 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 // note this was only reproducible with lib crates
-// compile-flags: --crate-type=lib
+//@ compile-flags: --crate-type=lib
 
 pub struct Hz;
 
diff --git a/tests/ui/consts/is_val_statically_known.rs b/tests/ui/consts/is_val_statically_known.rs
index 7362978301a..a9059817bcc 100644
--- a/tests/ui/consts/is_val_statically_known.rs
+++ b/tests/ui/consts/is_val_statically_known.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(core_intrinsics, is_val_statically_known)]
 
diff --git a/tests/ui/consts/issue-104155.rs b/tests/ui/consts/issue-104155.rs
index 7b375dc0566..ed3cd9c4bdf 100644
--- a/tests/ui/consts/issue-104155.rs
+++ b/tests/ui/consts/issue-104155.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![allow(forgetting_copy_types)]
 
diff --git a/tests/ui/consts/issue-104396.rs b/tests/ui/consts/issue-104396.rs
index 315b0cf0fd6..f44abc359d6 100644
--- a/tests/ui/consts/issue-104396.rs
+++ b/tests/ui/consts/issue-104396.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zmir-opt-level=3
-// check-pass
+//@ compile-flags: -Zmir-opt-level=3
+//@ check-pass
 
 #![feature(generic_const_exprs)]
 //~^ WARN the feature `generic_const_exprs` is incomplete
diff --git a/tests/ui/consts/issue-105536-const-val-roundtrip-ptr-eq.rs b/tests/ui/consts/issue-105536-const-val-roundtrip-ptr-eq.rs
index 1615399be32..7941947f25d 100644
--- a/tests/ui/consts/issue-105536-const-val-roundtrip-ptr-eq.rs
+++ b/tests/ui/consts/issue-105536-const-val-roundtrip-ptr-eq.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // This does not reflect a stable guarantee (we guarantee very little for equality of pointers
 // around `const`), but it would be good to understand what is happening if these assertions ever
diff --git a/tests/ui/consts/issue-13837.rs b/tests/ui/consts/issue-13837.rs
index 645b1c0eb87..305512cc41c 100644
--- a/tests/ui/consts/issue-13837.rs
+++ b/tests/ui/consts/issue-13837.rs
@@ -1,6 +1,6 @@
-// check-pass
+//@ check-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 struct TestStruct {
     x: *const [isize; 2]
diff --git a/tests/ui/consts/issue-13902.rs b/tests/ui/consts/issue-13902.rs
index 1afde0ebe85..b14f36dd218 100644
--- a/tests/ui/consts/issue-13902.rs
+++ b/tests/ui/consts/issue-13902.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/consts/issue-17074.rs b/tests/ui/consts/issue-17074.rs
index 0ed81132ec6..bd62602b6ef 100644
--- a/tests/ui/consts/issue-17074.rs
+++ b/tests/ui/consts/issue-17074.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 static X2: u64 = !0 as u16 as u64;
diff --git a/tests/ui/consts/issue-17718-borrow-interior.rs b/tests/ui/consts/issue-17718-borrow-interior.rs
index 5861f218689..9edff0c4147 100644
--- a/tests/ui/consts/issue-17718-borrow-interior.rs
+++ b/tests/ui/consts/issue-17718-borrow-interior.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 struct S { a: usize }
 
diff --git a/tests/ui/consts/issue-17718.rs b/tests/ui/consts/issue-17718.rs
index c6341d80844..b6c676886c1 100644
--- a/tests/ui/consts/issue-17718.rs
+++ b/tests/ui/consts/issue-17718.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// aux-build:issue-17718-aux.rs
+//@ aux-build:issue-17718-aux.rs
 
 extern crate issue_17718_aux as other;
 
diff --git a/tests/ui/consts/issue-17756.rs b/tests/ui/consts/issue-17756.rs
index 1835b177ff3..8a419e8046d 100644
--- a/tests/ui/consts/issue-17756.rs
+++ b/tests/ui/consts/issue-17756.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_variables)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/issue-19244.rs b/tests/ui/consts/issue-19244.rs
index 44d9748fd2a..02a109cc65c 100644
--- a/tests/ui/consts/issue-19244.rs
+++ b/tests/ui/consts/issue-19244.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct MyStruct { field: usize }
 struct Nested { nested: MyStruct }
diff --git a/tests/ui/consts/issue-21562.rs b/tests/ui/consts/issue-21562.rs
index a47d739c6be..87d97e436c5 100644
--- a/tests/ui/consts/issue-21562.rs
+++ b/tests/ui/consts/issue-21562.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/issue-21721.rs b/tests/ui/consts/issue-21721.rs
index 4c1411e1ecf..1300c4a7884 100644
--- a/tests/ui/consts/issue-21721.rs
+++ b/tests/ui/consts/issue-21721.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn main() {
     static NONE: Option<((), &'static u8)> = None;
diff --git a/tests/ui/consts/issue-23833.rs b/tests/ui/consts/issue-23833.rs
index d4128fa54e3..1d595f5e9ac 100644
--- a/tests/ui/consts/issue-23833.rs
+++ b/tests/ui/consts/issue-23833.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_imports)]
 use std::fmt;
 
diff --git a/tests/ui/consts/issue-23968-const-not-overflow.rs b/tests/ui/consts/issue-23968-const-not-overflow.rs
index b9593021235..88aff296051 100644
--- a/tests/ui/consts/issue-23968-const-not-overflow.rs
+++ b/tests/ui/consts/issue-23968-const-not-overflow.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 const U8_MAX_HALF: u8 = !0u8 / 2;
 const U16_MAX_HALF: u16 = !0u16 / 2;
 const U32_MAX_HALF: u32 = !0u32 / 2;
diff --git a/tests/ui/consts/issue-27890.rs b/tests/ui/consts/issue-27890.rs
index 9f85473380f..143cb58e49e 100644
--- a/tests/ui/consts/issue-27890.rs
+++ b/tests/ui/consts/issue-27890.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 static PLUS_ONE: &'static (dyn Fn(i32) -> i32 + Sync) = (&|x: i32| { x + 1 })
     as &'static (dyn Fn(i32) -> i32 + Sync);
 
diff --git a/tests/ui/consts/issue-28822.rs b/tests/ui/consts/issue-28822.rs
index 10e5d1dd0ac..07c30bcf98d 100644
--- a/tests/ui/consts/issue-28822.rs
+++ b/tests/ui/consts/issue-28822.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(dead_code)]
 
 fn main() {}
diff --git a/tests/ui/consts/issue-29798.rs b/tests/ui/consts/issue-29798.rs
index 5eff5d1915b..bdabbad6491 100644
--- a/tests/ui/consts/issue-29798.rs
+++ b/tests/ui/consts/issue-29798.rs
@@ -1,6 +1,6 @@
-// run-fail
-// error-pattern:index out of bounds: the len is 5 but the index is 5
-// ignore-emscripten no processes
+//@ run-fail
+//@ error-pattern:index out of bounds: the len is 5 but the index is 5
+//@ ignore-emscripten no processes
 
 const fn test(x: usize) -> i32 {
     [42;5][x]
diff --git a/tests/ui/consts/issue-29914-2.rs b/tests/ui/consts/issue-29914-2.rs
index 626de269d95..36a82f5b950 100644
--- a/tests/ui/consts/issue-29914-2.rs
+++ b/tests/ui/consts/issue-29914-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 const ARR: [usize; 5] = [5, 4, 3, 2, 1];
 
 fn main() {
diff --git a/tests/ui/consts/issue-29914-3.rs b/tests/ui/consts/issue-29914-3.rs
index 1c6c64eb316..575cd30e229 100644
--- a/tests/ui/consts/issue-29914-3.rs
+++ b/tests/ui/consts/issue-29914-3.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 const ARR: [usize; 5] = [5, 4, 3, 2, 1];
 const BLA: usize = ARR[ARR[3]];
 
diff --git a/tests/ui/consts/issue-29914.rs b/tests/ui/consts/issue-29914.rs
index 6da63664dfa..7897733c723 100644
--- a/tests/ui/consts/issue-29914.rs
+++ b/tests/ui/consts/issue-29914.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(stable_features)]
 
 #![feature(const_indexing)]
diff --git a/tests/ui/consts/issue-29927-1.rs b/tests/ui/consts/issue-29927-1.rs
index a236e491375..544737765bb 100644
--- a/tests/ui/consts/issue-29927-1.rs
+++ b/tests/ui/consts/issue-29927-1.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 const fn f() -> usize {
     5
diff --git a/tests/ui/consts/issue-29927.rs b/tests/ui/consts/issue-29927.rs
index 3385e4e6e94..bda5138fcd2 100644
--- a/tests/ui/consts/issue-29927.rs
+++ b/tests/ui/consts/issue-29927.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 struct A {
     field: usize,
diff --git a/tests/ui/consts/issue-33537.rs b/tests/ui/consts/issue-33537.rs
index 3539aa64776..71e3418f555 100644
--- a/tests/ui/consts/issue-33537.rs
+++ b/tests/ui/consts/issue-33537.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const fn foo() -> *const i8 {
     b"foo" as *const _ as *const i8
diff --git a/tests/ui/consts/issue-33903.rs b/tests/ui/consts/issue-33903.rs
index 613aa121a47..0355f4e7046 100644
--- a/tests/ui/consts/issue-33903.rs
+++ b/tests/ui/consts/issue-33903.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(dead_code)]
 // Issue 33903:
 // Built-in indexing should be used even when the index is not
diff --git a/tests/ui/consts/issue-3521.fixed b/tests/ui/consts/issue-3521.fixed
index f76106dfff1..e091328d7d7 100644
--- a/tests/ui/consts/issue-3521.fixed
+++ b/tests/ui/consts/issue-3521.fixed
@@ -1,4 +1,4 @@
-// run-rustfix
+//@ run-rustfix
 fn main() {
     #[allow(non_upper_case_globals)]
     const foo: isize = 100;
diff --git a/tests/ui/consts/issue-3521.rs b/tests/ui/consts/issue-3521.rs
index c425a22df91..b31c6354ba4 100644
--- a/tests/ui/consts/issue-3521.rs
+++ b/tests/ui/consts/issue-3521.rs
@@ -1,4 +1,4 @@
-// run-rustfix
+//@ run-rustfix
 fn main() {
     #[allow(non_upper_case_globals)]
     let foo: isize = 100;
diff --git a/tests/ui/consts/issue-37222.rs b/tests/ui/consts/issue-37222.rs
index 8ea5f6b7a27..a279e786bd7 100644
--- a/tests/ui/consts/issue-37222.rs
+++ b/tests/ui/consts/issue-37222.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #[derive(Debug, PartialEq)]
 enum Bar {
diff --git a/tests/ui/consts/issue-37550-1.rs b/tests/ui/consts/issue-37550-1.rs
index 4d00ac7fd0d..ddd247cbe25 100644
--- a/tests/ui/consts/issue-37550-1.rs
+++ b/tests/ui/consts/issue-37550-1.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const fn x() {
     let t = true;
diff --git a/tests/ui/consts/issue-37550.rs b/tests/ui/consts/issue-37550.rs
index 724eb28291e..332e5db7a0f 100644
--- a/tests/ui/consts/issue-37550.rs
+++ b/tests/ui/consts/issue-37550.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 
diff --git a/tests/ui/consts/issue-37991.rs b/tests/ui/consts/issue-37991.rs
index a6ac4d5ca2e..1b8cb5210cd 100644
--- a/tests/ui/consts/issue-37991.rs
+++ b/tests/ui/consts/issue-37991.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const fn foo() -> i64 {
     3
diff --git a/tests/ui/consts/issue-39161-bogus-error.rs b/tests/ui/consts/issue-39161-bogus-error.rs
index a954385da41..2259872caa6 100644
--- a/tests/ui/consts/issue-39161-bogus-error.rs
+++ b/tests/ui/consts/issue-39161-bogus-error.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub struct X {
     pub a: i32,
diff --git a/tests/ui/consts/issue-44255.rs b/tests/ui/consts/issue-44255.rs
index 22450320432..9b1e0ffa7cb 100644
--- a/tests/ui/consts/issue-44255.rs
+++ b/tests/ui/consts/issue-44255.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::marker::PhantomData;
 
diff --git a/tests/ui/consts/issue-46553.rs b/tests/ui/consts/issue-46553.rs
index abeaf10f2b5..668f752dacb 100644
--- a/tests/ui/consts/issue-46553.rs
+++ b/tests/ui/consts/issue-46553.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub struct Data<T> {
     function: fn() -> T,
diff --git a/tests/ui/consts/issue-47789.rs b/tests/ui/consts/issue-47789.rs
index 32dd909b2e9..a6acfbb8ee6 100644
--- a/tests/ui/consts/issue-47789.rs
+++ b/tests/ui/consts/issue-47789.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(non_upper_case_globals)]
 
 static mut x: &'static u32 = &0;
diff --git a/tests/ui/consts/issue-54348.rs b/tests/ui/consts/issue-54348.rs
index 5c38d7c42f6..9710d6de838 100644
--- a/tests/ui/consts/issue-54348.rs
+++ b/tests/ui/consts/issue-54348.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 fn main() {
     [1][0u64 as usize];
diff --git a/tests/ui/consts/issue-54387.rs b/tests/ui/consts/issue-54387.rs
index 60e3a02f4ce..371d89ad32b 100644
--- a/tests/ui/consts/issue-54387.rs
+++ b/tests/ui/consts/issue-54387.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub struct GstRc {
     _obj: *const (),
diff --git a/tests/ui/consts/issue-54582.rs b/tests/ui/consts/issue-54582.rs
index 8c50cac67f8..90866ab4ce2 100644
--- a/tests/ui/consts/issue-54582.rs
+++ b/tests/ui/consts/issue-54582.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub trait Stage: Sync {}
 
diff --git a/tests/ui/consts/issue-58435-ice-with-assoc-const.rs b/tests/ui/consts/issue-58435-ice-with-assoc-const.rs
index fac727d2d7d..6b4722d349e 100644
--- a/tests/ui/consts/issue-58435-ice-with-assoc-const.rs
+++ b/tests/ui/consts/issue-58435-ice-with-assoc-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // The const-evaluator was at one point ICE'ing while trying to
 // evaluate the body of `fn id` during the `s.id()` call in main.
 
diff --git a/tests/ui/consts/issue-62045.rs b/tests/ui/consts/issue-62045.rs
index 5abed374a6d..5dac2a18b7b 100644
--- a/tests/ui/consts/issue-62045.rs
+++ b/tests/ui/consts/issue-62045.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 fn main() {
     assert_eq!(&mut [0; 1][..], &mut []);
diff --git a/tests/ui/consts/issue-63226.rs b/tests/ui/consts/issue-63226.rs
index deec4499008..f8ceab33925 100644
--- a/tests/ui/consts/issue-63226.rs
+++ b/tests/ui/consts/issue-63226.rs
@@ -1,7 +1,7 @@
-// aux-build:issue-63226.rs
-// compile-flags:--extern issue_63226
-// edition:2018
-// build-pass
+//@ aux-build:issue-63226.rs
+//@ compile-flags:--extern issue_63226
+//@ edition:2018
+//@ build-pass
 // A regression test for issue #63226.
 // Checks if `const fn` is marked as reachable.
 
diff --git a/tests/ui/consts/issue-63952.rs b/tests/ui/consts/issue-63952.rs
index 5c83e6f45c9..aee06f8eb04 100644
--- a/tests/ui/consts/issue-63952.rs
+++ b/tests/ui/consts/issue-63952.rs
@@ -1,5 +1,5 @@
 // Regression test for #63952, shouldn't hang.
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 
 #[repr(C)]
 #[derive(Copy, Clone)]
diff --git a/tests/ui/consts/issue-64059.rs b/tests/ui/consts/issue-64059.rs
index 02c8b725032..8bb2d0fe05a 100644
--- a/tests/ui/consts/issue-64059.rs
+++ b/tests/ui/consts/issue-64059.rs
@@ -1,9 +1,9 @@
-// revisions: noopt opt opt_with_overflow_checks
-//[noopt]compile-flags: -C opt-level=0
-//[opt]compile-flags: -O
-//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+//@ revisions: noopt opt opt_with_overflow_checks
+//@[noopt]compile-flags: -C opt-level=0
+//@[opt]compile-flags: -O
+//@[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
 
-// run-pass
+//@ run-pass
 
 fn main() {
     let _ = -(-0.0);
diff --git a/tests/ui/consts/issue-64506.rs b/tests/ui/consts/issue-64506.rs
index 9275a8a072d..096d29cbe49 100644
--- a/tests/ui/consts/issue-64506.rs
+++ b/tests/ui/consts/issue-64506.rs
@@ -1,4 +1,4 @@
-// check-fail
+//@ check-fail
 
 #[derive(Copy, Clone)]
 pub struct ChildStdin {
diff --git a/tests/ui/consts/issue-65348.rs b/tests/ui/consts/issue-65348.rs
index 01bf2a3fa42..1443fcbe1c1 100644
--- a/tests/ui/consts/issue-65348.rs
+++ b/tests/ui/consts/issue-65348.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 struct Generic<T>(T);
 
diff --git a/tests/ui/consts/issue-66342.rs b/tests/ui/consts/issue-66342.rs
index 417f6904165..0a87f789e48 100644
--- a/tests/ui/consts/issue-66342.rs
+++ b/tests/ui/consts/issue-66342.rs
@@ -1,5 +1,5 @@
-// check-pass
-// only-x86_64
+//@ check-pass
+//@ only-x86_64
 
 // Checks that the compiler does not actually try to allocate 4 TB during compilation and OOM crash.
 
diff --git a/tests/ui/consts/issue-66345.rs b/tests/ui/consts/issue-66345.rs
index 4971d96476f..a69ce7f191a 100644
--- a/tests/ui/consts/issue-66345.rs
+++ b/tests/ui/consts/issue-66345.rs
@@ -1,5 +1,5 @@
-// run-pass
-// compile-flags: -Z mir-opt-level=4
+//@ run-pass
+//@ compile-flags: -Z mir-opt-level=4
 
 // Checks that the compiler does not ICE when passing references to field of by-value struct
 // with -Z mir-opt-level=4
diff --git a/tests/ui/consts/issue-66397.rs b/tests/ui/consts/issue-66397.rs
index 1b4aff43b5b..f6c8854dc78 100644
--- a/tests/ui/consts/issue-66397.rs
+++ b/tests/ui/consts/issue-66397.rs
@@ -1,5 +1,5 @@
-// check-pass
-// only-x86_64
+//@ check-pass
+//@ only-x86_64
 
 // Checks that the compiler does not actually try to allocate 4 TB during compilation and OOM crash.
 
diff --git a/tests/ui/consts/issue-66787.rs b/tests/ui/consts/issue-66787.rs
index 612b795eb5c..142c5f65a4e 100644
--- a/tests/ui/consts/issue-66787.rs
+++ b/tests/ui/consts/issue-66787.rs
@@ -1,5 +1,5 @@
-// build-pass
-// compile-flags: --crate-type lib
+//@ build-pass
+//@ compile-flags: --crate-type lib
 
 // Regression test for ICE which occurred when const propagating an enum with three variants
 // one of which is uninhabited.
diff --git a/tests/ui/consts/issue-67529.rs b/tests/ui/consts/issue-67529.rs
index dd24c2d27e2..39fca411201 100644
--- a/tests/ui/consts/issue-67529.rs
+++ b/tests/ui/consts/issue-67529.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Z mir-opt-level=3
-// run-pass
+//@ compile-flags: -Z mir-opt-level=3
+//@ run-pass
 
 struct Baz<T: ?Sized> {
     a: T
diff --git a/tests/ui/consts/issue-67640.rs b/tests/ui/consts/issue-67640.rs
index 4c71a2e0224..e5b0a563935 100644
--- a/tests/ui/consts/issue-67640.rs
+++ b/tests/ui/consts/issue-67640.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Z mir-opt-level=4
-// run-pass
+//@ compile-flags: -Z mir-opt-level=4
+//@ run-pass
 
 struct X {
     x: isize
diff --git a/tests/ui/consts/issue-67641.rs b/tests/ui/consts/issue-67641.rs
index e5a74f15654..4a211bb2921 100644
--- a/tests/ui/consts/issue-67641.rs
+++ b/tests/ui/consts/issue-67641.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Z mir-opt-level=3
-// run-pass
+//@ compile-flags: -Z mir-opt-level=3
+//@ run-pass
 
 use std::cell::Cell;
 
diff --git a/tests/ui/consts/issue-67696-const-prop-ice.rs b/tests/ui/consts/issue-67696-const-prop-ice.rs
index 858035190ca..09e5ba74c33 100644
--- a/tests/ui/consts/issue-67696-const-prop-ice.rs
+++ b/tests/ui/consts/issue-67696-const-prop-ice.rs
@@ -1,5 +1,5 @@
-// check-pass
-// compile-flags: --emit=mir,link -Zmir-opt-level=4
+//@ check-pass
+//@ compile-flags: --emit=mir,link -Zmir-opt-level=4
 // Checks that we don't ICE due to attempting to run const prop
 // on a function with unsatisifable 'where' clauses
 
diff --git a/tests/ui/consts/issue-67862.rs b/tests/ui/consts/issue-67862.rs
index b9e96a87f14..cac617fbd54 100644
--- a/tests/ui/consts/issue-67862.rs
+++ b/tests/ui/consts/issue-67862.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Z mir-opt-level=3
-// run-pass
+//@ compile-flags: -Z mir-opt-level=3
+//@ run-pass
 
 fn e220() -> (i64, i64) {
     #[inline(never)]
diff --git a/tests/ui/consts/issue-68264-overflow.rs b/tests/ui/consts/issue-68264-overflow.rs
index 8f21e0648d4..6a1d57ea67f 100644
--- a/tests/ui/consts/issue-68264-overflow.rs
+++ b/tests/ui/consts/issue-68264-overflow.rs
@@ -1,5 +1,5 @@
-// check-pass
-// compile-flags: --emit=mir,link
+//@ check-pass
+//@ compile-flags: --emit=mir,link
 // Regression test for issue #68264
 // Checks that we don't encounter overflow
 // when running const-prop on functions with
diff --git a/tests/ui/consts/issue-68684.rs b/tests/ui/consts/issue-68684.rs
index c98f199b60e..d2ba405d669 100644
--- a/tests/ui/consts/issue-68684.rs
+++ b/tests/ui/consts/issue-68684.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 enum _Enum {
     A(),
diff --git a/tests/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs b/tests/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
index 5b7c7be42cf..e29e1e2b19c 100644
--- a/tests/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
+++ b/tests/ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 //
 // (this is deliberately *not* check-pass; I have confirmed that the bug in
 // question does not replicate when one uses `cargo check` alone.)
diff --git a/tests/ui/consts/issue-69312.rs b/tests/ui/consts/issue-69312.rs
index 413c6752079..1c0dc1f87ea 100644
--- a/tests/ui/consts/issue-69312.rs
+++ b/tests/ui/consts/issue-69312.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 // Verify that the compiler doesn't ICE during const prop while evaluating the index operation.
 
diff --git a/tests/ui/consts/issue-69488.rs b/tests/ui/consts/issue-69488.rs
index 46546eada7a..35071999111 100644
--- a/tests/ui/consts/issue-69488.rs
+++ b/tests/ui/consts/issue-69488.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_ptr_write)]
 #![feature(const_mut_refs)]
diff --git a/tests/ui/consts/issue-69532.rs b/tests/ui/consts/issue-69532.rs
index 0a891781299..285cfe7213b 100644
--- a/tests/ui/consts/issue-69532.rs
+++ b/tests/ui/consts/issue-69532.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const fn make_nans() -> (f64, f64, f32, f32) {
     let nan1: f64 = unsafe { std::mem::transmute(0x7FF0_0001_0000_0001u64) };
diff --git a/tests/ui/consts/issue-6991.rs b/tests/ui/consts/issue-6991.rs
index f00cd9aeffd..3e4a8b09f89 100644
--- a/tests/ui/consts/issue-6991.rs
+++ b/tests/ui/consts/issue-6991.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/issue-70773-mir-typeck-lt-norm.rs b/tests/ui/consts/issue-70773-mir-typeck-lt-norm.rs
index f82ec005a01..97462a705d5 100644
--- a/tests/ui/consts/issue-70773-mir-typeck-lt-norm.rs
+++ b/tests/ui/consts/issue-70773-mir-typeck-lt-norm.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const HASH_LEN: usize = 20;
 struct Hash(#[allow(dead_code)] [u8; HASH_LEN]);
diff --git a/tests/ui/consts/issue-73976-monomorphic.rs b/tests/ui/consts/issue-73976-monomorphic.rs
index a3b9510036d..561c1976051 100644
--- a/tests/ui/consts/issue-73976-monomorphic.rs
+++ b/tests/ui/consts/issue-73976-monomorphic.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 //
 // This test is complement to the test in issue-73976-polymorphic.rs.
 // In that test we ensure that polymorphic use of type_id and type_name in patterns
diff --git a/tests/ui/consts/issue-77062-large-zst-array.rs b/tests/ui/consts/issue-77062-large-zst-array.rs
index 0566b802e75..ef5178fba95 100644
--- a/tests/ui/consts/issue-77062-large-zst-array.rs
+++ b/tests/ui/consts/issue-77062-large-zst-array.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 fn main() {
     let _ = &[(); usize::MAX];
diff --git a/tests/ui/consts/issue-79137-monomorphic.rs b/tests/ui/consts/issue-79137-monomorphic.rs
index 58e0c387ffb..d98982b4af6 100644
--- a/tests/ui/consts/issue-79137-monomorphic.rs
+++ b/tests/ui/consts/issue-79137-monomorphic.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // Verify that variant count intrinsic can still evaluate for types like `Option<T>`.
 
diff --git a/tests/ui/consts/issue-79152-const-array-index.rs b/tests/ui/consts/issue-79152-const-array-index.rs
index 95518e1bbdb..f5471fb7482 100644
--- a/tests/ui/consts/issue-79152-const-array-index.rs
+++ b/tests/ui/consts/issue-79152-const-array-index.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 // Regression test for issue #79152
 //
 // Tests that we can index an array in a const function
diff --git a/tests/ui/consts/issue-79690.rs b/tests/ui/consts/issue-79690.rs
index 56747bf5a11..3da4cb73f11 100644
--- a/tests/ui/consts/issue-79690.rs
+++ b/tests/ui/consts/issue-79690.rs
@@ -1,6 +1,6 @@
-// ignore-32bit
+//@ ignore-32bit
 // This test gives a different error on 32-bit architectures.
-// stderr-per-bitwidth
+//@ stderr-per-bitwidth
 
 union Transmute<T: Copy, U: Copy> {
     t: T,
diff --git a/tests/ui/consts/issue-88071.rs b/tests/ui/consts/issue-88071.rs
index f58cdb5945e..327daad9b32 100644
--- a/tests/ui/consts/issue-88071.rs
+++ b/tests/ui/consts/issue-88071.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 //
 // regression test for #88071
 
diff --git a/tests/ui/consts/issue-88649.rs b/tests/ui/consts/issue-88649.rs
index 43e562b5a7d..739b97ff708 100644
--- a/tests/ui/consts/issue-88649.rs
+++ b/tests/ui/consts/issue-88649.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![crate_type = "lib"]
 
 enum Foo {
diff --git a/tests/ui/consts/issue-89088.rs b/tests/ui/consts/issue-89088.rs
index 40cc665fb61..d0782963dfc 100644
--- a/tests/ui/consts/issue-89088.rs
+++ b/tests/ui/consts/issue-89088.rs
@@ -1,6 +1,6 @@
 // Regression test for the ICE described in #89088.
 
-// check-pass
+//@ check-pass
 
 #![allow(indirect_structural_match)]
 use std::borrow::Cow;
diff --git a/tests/ui/consts/issue-90762.rs b/tests/ui/consts/issue-90762.rs
index 78d387386f8..db40e50d499 100644
--- a/tests/ui/consts/issue-90762.rs
+++ b/tests/ui/consts/issue-90762.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unreachable_code)]
 
 use std::sync::atomic::{AtomicBool, Ordering, AtomicUsize};
diff --git a/tests/ui/consts/issue-90870.fixed b/tests/ui/consts/issue-90870.fixed
index df44689efed..c125501f61c 100644
--- a/tests/ui/consts/issue-90870.fixed
+++ b/tests/ui/consts/issue-90870.fixed
@@ -1,6 +1,6 @@
 // Regression test for issue #90870.
 
-// run-rustfix
+//@ run-rustfix
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/consts/issue-90870.rs b/tests/ui/consts/issue-90870.rs
index 676ac73c64d..94254fb27f9 100644
--- a/tests/ui/consts/issue-90870.rs
+++ b/tests/ui/consts/issue-90870.rs
@@ -1,6 +1,6 @@
 // Regression test for issue #90870.
 
-// run-rustfix
+//@ run-rustfix
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/consts/issue-91560.fixed b/tests/ui/consts/issue-91560.fixed
index 41b9d95734a..b975e6ee958 100644
--- a/tests/ui/consts/issue-91560.fixed
+++ b/tests/ui/consts/issue-91560.fixed
@@ -1,6 +1,6 @@
 // Regression test for issue #91560.
 
-// run-rustfix
+//@ run-rustfix
 
 #![allow(unused,non_upper_case_globals)]
 
diff --git a/tests/ui/consts/issue-91560.rs b/tests/ui/consts/issue-91560.rs
index 04592feb505..5e7e1cbe1e5 100644
--- a/tests/ui/consts/issue-91560.rs
+++ b/tests/ui/consts/issue-91560.rs
@@ -1,6 +1,6 @@
 // Regression test for issue #91560.
 
-// run-rustfix
+//@ run-rustfix
 
 #![allow(unused,non_upper_case_globals)]
 
diff --git a/tests/ui/consts/issue-94371.rs b/tests/ui/consts/issue-94371.rs
index de9ff730b66..3484437e571 100644
--- a/tests/ui/consts/issue-94371.rs
+++ b/tests/ui/consts/issue-94371.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(const_swap)]
 #![feature(const_mut_refs)]
diff --git a/tests/ui/consts/issue-94675.rs b/tests/ui/consts/issue-94675.rs
index 2358175fe92..00f5c3251e0 100644
--- a/tests/ui/consts/issue-94675.rs
+++ b/tests/ui/consts/issue-94675.rs
@@ -1,4 +1,4 @@
-// known-bug: #103507
+//@ known-bug: #103507
 
 #![feature(const_trait_impl, const_mut_refs)]
 
diff --git a/tests/ui/consts/issue-96169.rs b/tests/ui/consts/issue-96169.rs
index 14c0a1399a0..24131f7f6ac 100644
--- a/tests/ui/consts/issue-96169.rs
+++ b/tests/ui/consts/issue-96169.rs
@@ -1,5 +1,5 @@
-// check-pass
-// compile-flags: -Zmir-opt-level=4 --emit=mir
+//@ check-pass
+//@ compile-flags: -Zmir-opt-level=4 --emit=mir
 #![allow(unused)]
 fn a() -> usize { 0 }
 
diff --git a/tests/ui/consts/issue-broken-mir.rs b/tests/ui/consts/issue-broken-mir.rs
index 36f0ff92104..25219f4c335 100644
--- a/tests/ui/consts/issue-broken-mir.rs
+++ b/tests/ui/consts/issue-broken-mir.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/27918
 
diff --git a/tests/ui/consts/issue-miri-1910.rs b/tests/ui/consts/issue-miri-1910.rs
index 3798332dfd7..a66cb6b6665 100644
--- a/tests/ui/consts/issue-miri-1910.rs
+++ b/tests/ui/consts/issue-miri-1910.rs
@@ -1,5 +1,5 @@
-// error-pattern unable to turn pointer into raw bytes
-// normalize-stderr-test: "alloc[0-9]+\+0x[a-z0-9]+" -> "ALLOC"
+//@ error-pattern unable to turn pointer into raw bytes
+//@ normalize-stderr-test: "alloc[0-9]+\+0x[a-z0-9]+" -> "ALLOC"
 
 const C: () = unsafe {
     let foo = Some(&42 as *const i32);
diff --git a/tests/ui/consts/large_const_alloc.rs b/tests/ui/consts/large_const_alloc.rs
index 298ed38d180..61a22216ae5 100644
--- a/tests/ui/consts/large_const_alloc.rs
+++ b/tests/ui/consts/large_const_alloc.rs
@@ -1,4 +1,4 @@
-// only-64bit
+//@ only-64bit
 // on 32bit and 16bit platforms it is plausible that the maximum allocation size will succeed
 
 const FOO: () = {
diff --git a/tests/ui/consts/let-irrefutable-pattern-ice-120337.rs b/tests/ui/consts/let-irrefutable-pattern-ice-120337.rs
index 7da6b7ca285..e0d1d515deb 100644
--- a/tests/ui/consts/let-irrefutable-pattern-ice-120337.rs
+++ b/tests/ui/consts/let-irrefutable-pattern-ice-120337.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![feature(never_type)]
 #[derive(Copy, Clone)]
 pub enum E { A(!), }
diff --git a/tests/ui/consts/locals-in-const-fn.rs b/tests/ui/consts/locals-in-const-fn.rs
index 95d50171a84..98f230320f6 100644
--- a/tests/ui/consts/locals-in-const-fn.rs
+++ b/tests/ui/consts/locals-in-const-fn.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/48821
 
diff --git a/tests/ui/consts/match-const-fn-structs.rs b/tests/ui/consts/match-const-fn-structs.rs
index 5a68048c477..49bb15977b8 100644
--- a/tests/ui/consts/match-const-fn-structs.rs
+++ b/tests/ui/consts/match-const-fn-structs.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_variables)]
 
 // https://github.com/rust-lang/rust/issues/46114
diff --git a/tests/ui/consts/min_const_fn/address_of_const.rs b/tests/ui/consts/min_const_fn/address_of_const.rs
index 3db19e9cde8..4280d0745c1 100644
--- a/tests/ui/consts/min_const_fn/address_of_const.rs
+++ b/tests/ui/consts/min_const_fn/address_of_const.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(raw_ref_op)]
 
diff --git a/tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs b/tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
index 2dbc424d3ba..a97eeadd92f 100644
--- a/tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
+++ b/tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(rustc_allow_const_fn_unstable)]
 
 #![feature(rustc_attrs, staged_api)]
diff --git a/tests/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs b/tests/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs
index d2211575560..8928ad44a70 100644
--- a/tests/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs
+++ b/tests/ui/consts/min_const_fn/allow_raw_ptr_dereference_const_fn.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 use std::ptr;
 
diff --git a/tests/ui/consts/min_const_fn/cast_fn.rs b/tests/ui/consts/min_const_fn/cast_fn.rs
index 85802a51490..8c0a109781f 100644
--- a/tests/ui/consts/min_const_fn/cast_fn.rs
+++ b/tests/ui/consts/min_const_fn/cast_fn.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 fn main() {}
 
diff --git a/tests/ui/consts/min_const_fn/min_const_fn_dyn.rs b/tests/ui/consts/min_const_fn/min_const_fn_dyn.rs
index 36c8880093e..8335375dcfc 100644
--- a/tests/ui/consts/min_const_fn/min_const_fn_dyn.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_dyn.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 struct HasDyn {
     field: &'static dyn std::fmt::Debug,
diff --git a/tests/ui/consts/min_const_fn/min_const_fn_libstd.rs b/tests/ui/consts/min_const_fn/min_const_fn_libstd.rs
index cb8f74186bd..14a995aca31 100644
--- a/tests/ui/consts/min_const_fn/min_const_fn_libstd.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_libstd.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 use std::cell::UnsafeCell;
 use std::sync::atomic::AtomicU32;
diff --git a/tests/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs
index 02c7970deca..06e7d6f5d70 100644
--- a/tests/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs
+++ b/tests/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 const unsafe fn ret_i32_no_unsafe() -> i32 { 42 }
 const unsafe fn ret_null_ptr_no_unsafe<T>() -> *const T { std::ptr::null() }
diff --git a/tests/ui/consts/miri_unleashed/abi-mismatch.rs b/tests/ui/consts/miri_unleashed/abi-mismatch.rs
index 205f7183b75..57680479a17 100644
--- a/tests/ui/consts/miri_unleashed/abi-mismatch.rs
+++ b/tests/ui/consts/miri_unleashed/abi-mismatch.rs
@@ -1,5 +1,5 @@
 // Checks that we report ABI mismatches for "const extern fn"
-// compile-flags: -Z unleash-the-miri-inside-of-you
+//@ compile-flags: -Z unleash-the-miri-inside-of-you
 
 #![feature(const_extern_fn)]
 
diff --git a/tests/ui/consts/miri_unleashed/assoc_const.rs b/tests/ui/consts/miri_unleashed/assoc_const.rs
index 7bb0c1b772a..db37197f190 100644
--- a/tests/ui/consts/miri_unleashed/assoc_const.rs
+++ b/tests/ui/consts/miri_unleashed/assoc_const.rs
@@ -1,5 +1,5 @@
-// build-fail
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ build-fail
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 // a test demonstrating why we do need to run static const qualification on associated constants
 // instead of just checking the final constant
diff --git a/tests/ui/consts/miri_unleashed/assoc_const_2.rs b/tests/ui/consts/miri_unleashed/assoc_const_2.rs
index aad5b34606e..5490c096391 100644
--- a/tests/ui/consts/miri_unleashed/assoc_const_2.rs
+++ b/tests/ui/consts/miri_unleashed/assoc_const_2.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 // a test demonstrating that const qualification cannot prevent monomorphization time errors
 
diff --git a/tests/ui/consts/miri_unleashed/box.rs b/tests/ui/consts/miri_unleashed/box.rs
index 39cddda2b80..89df4526b07 100644
--- a/tests/ui/consts/miri_unleashed/box.rs
+++ b/tests/ui/consts/miri_unleashed/box.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 use std::mem::ManuallyDrop;
 
diff --git a/tests/ui/consts/miri_unleashed/const_refers_to_static.rs b/tests/ui/consts/miri_unleashed/const_refers_to_static.rs
index 212003deba3..31f89030bb3 100644
--- a/tests/ui/consts/miri_unleashed/const_refers_to_static.rs
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static.rs
@@ -1,6 +1,6 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
diff --git a/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs
index 783b3d18051..6ec44aab2c1 100644
--- a/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs
+++ b/tests/ui/consts/miri_unleashed/const_refers_to_static_cross_crate.rs
@@ -1,7 +1,7 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
-// aux-build:static_cross_crate.rs
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
+//@ aux-build:static_cross_crate.rs
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(exclusive_range_pattern, half_open_range_patterns_in_slices)]
 #![allow(static_mut_ref)]
 
diff --git a/tests/ui/consts/miri_unleashed/drop.rs b/tests/ui/consts/miri_unleashed/drop.rs
index 3942e7ef734..45ade4906b8 100644
--- a/tests/ui/consts/miri_unleashed/drop.rs
+++ b/tests/ui/consts/miri_unleashed/drop.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
-// error-pattern: calling non-const function `<Vec<i32> as Drop>::drop`
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
+//@ error-pattern: calling non-const function `<Vec<i32> as Drop>::drop`
 
 use std::mem::ManuallyDrop;
 
diff --git a/tests/ui/consts/miri_unleashed/extern-static.rs b/tests/ui/consts/miri_unleashed/extern-static.rs
index 81176b3d4e9..1a523cc8e31 100644
--- a/tests/ui/consts/miri_unleashed/extern-static.rs
+++ b/tests/ui/consts/miri_unleashed/extern-static.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 #![feature(thread_local)]
 #![allow(static_mut_ref)]
 
diff --git a/tests/ui/consts/miri_unleashed/inline_asm.rs b/tests/ui/consts/miri_unleashed/inline_asm.rs
index 6fd52ceb24c..8627a6bf887 100644
--- a/tests/ui/consts/miri_unleashed/inline_asm.rs
+++ b/tests/ui/consts/miri_unleashed/inline_asm.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
-// only-x86_64
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
+//@ only-x86_64
 
 use std::arch::asm;
 
diff --git a/tests/ui/consts/miri_unleashed/mutable_references.rs b/tests/ui/consts/miri_unleashed/mutable_references.rs
index 4e996464705..a361c504b5e 100644
--- a/tests/ui/consts/miri_unleashed/mutable_references.rs
+++ b/tests/ui/consts/miri_unleashed/mutable_references.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 use std::cell::UnsafeCell;
 
diff --git a/tests/ui/consts/miri_unleashed/mutable_references_err.rs b/tests/ui/consts/miri_unleashed/mutable_references_err.rs
index 43b65f459a1..2075adad6f7 100644
--- a/tests/ui/consts/miri_unleashed/mutable_references_err.rs
+++ b/tests/ui/consts/miri_unleashed/mutable_references_err.rs
@@ -1,5 +1,5 @@
-// stderr-per-bitwidth
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ stderr-per-bitwidth
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 #![allow(invalid_reference_casting, static_mut_ref)]
 
 use std::sync::atomic::*;
diff --git a/tests/ui/consts/miri_unleashed/mutating_global.rs b/tests/ui/consts/miri_unleashed/mutating_global.rs
index 231f4af0a20..77781360374 100644
--- a/tests/ui/consts/miri_unleashed/mutating_global.rs
+++ b/tests/ui/consts/miri_unleashed/mutating_global.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 // Make sure we cannot mutate globals.
 
diff --git a/tests/ui/consts/miri_unleashed/non_const_fn.rs b/tests/ui/consts/miri_unleashed/non_const_fn.rs
index 44ab60dcabc..d3ffb61af11 100644
--- a/tests/ui/consts/miri_unleashed/non_const_fn.rs
+++ b/tests/ui/consts/miri_unleashed/non_const_fn.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 // A test demonstrating that we prevent calling non-const fn during CTFE.
 
diff --git a/tests/ui/consts/miri_unleashed/ptr_arith.rs b/tests/ui/consts/miri_unleashed/ptr_arith.rs
index e59c6725269..6dd8ab11e7c 100644
--- a/tests/ui/consts/miri_unleashed/ptr_arith.rs
+++ b/tests/ui/consts/miri_unleashed/ptr_arith.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 
 // During CTFE, we prevent pointer-to-int casts.
 // Pointer comparisons are prevented in the trait system.
diff --git a/tests/ui/consts/miri_unleashed/slice_eq.rs b/tests/ui/consts/miri_unleashed/slice_eq.rs
index 83e10bf1213..7f07823bdc6 100644
--- a/tests/ui/consts/miri_unleashed/slice_eq.rs
+++ b/tests/ui/consts/miri_unleashed/slice_eq.rs
@@ -1,5 +1,5 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
-// run-pass
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
+//@ run-pass
 
 #![feature(const_raw_ptr_comparison)]
 
diff --git a/tests/ui/consts/miri_unleashed/static-no-inner-mut.rs b/tests/ui/consts/miri_unleashed/static-no-inner-mut.rs
index a4033eb5683..4219f6fa683 100644
--- a/tests/ui/consts/miri_unleashed/static-no-inner-mut.rs
+++ b/tests/ui/consts/miri_unleashed/static-no-inner-mut.rs
@@ -1,5 +1,5 @@
-// stderr-per-bitwidth
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ stderr-per-bitwidth
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 #![feature(const_refs_to_cell, const_mut_refs)]
 // All "inner" allocations that come with a `static` are interned immutably. This means it is
 // crucial that we do not accept any form of (interior) mutability there.
diff --git a/tests/ui/consts/miri_unleashed/tls.rs b/tests/ui/consts/miri_unleashed/tls.rs
index 7319a5135d3..b0c6c088361 100644
--- a/tests/ui/consts/miri_unleashed/tls.rs
+++ b/tests/ui/consts/miri_unleashed/tls.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zunleash-the-miri-inside-of-you
+//@ compile-flags: -Zunleash-the-miri-inside-of-you
 #![feature(thread_local)]
 
 use std::thread;
diff --git a/tests/ui/consts/missing_span_in_backtrace.rs b/tests/ui/consts/missing_span_in_backtrace.rs
index 1ac3777f5fe..d45deee18fa 100644
--- a/tests/ui/consts/missing_span_in_backtrace.rs
+++ b/tests/ui/consts/missing_span_in_backtrace.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z ui-testing=no
+//@ compile-flags: -Z ui-testing=no
 
 
 #![feature(const_swap)]
diff --git a/tests/ui/consts/mozjs-error.rs b/tests/ui/consts/mozjs-error.rs
index 7edcadbf2cb..4f07cf3e35c 100644
--- a/tests/ui/consts/mozjs-error.rs
+++ b/tests/ui/consts/mozjs-error.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/consts/non-scalar-cast.rs b/tests/ui/consts/non-scalar-cast.rs
index 671366c90ec..fa0f63d8aca 100644
--- a/tests/ui/consts/non-scalar-cast.rs
+++ b/tests/ui/consts/non-scalar-cast.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/37448
 
diff --git a/tests/ui/consts/non-sync-references-in-const.rs b/tests/ui/consts/non-sync-references-in-const.rs
index 0f668b8d469..3a8738501ec 100644
--- a/tests/ui/consts/non-sync-references-in-const.rs
+++ b/tests/ui/consts/non-sync-references-in-const.rs
@@ -1,5 +1,5 @@
-// check-pass
-// known-bug: #49206
+//@ check-pass
+//@ known-bug: #49206
 
 // Should fail. Compiles and prints 2 identical addresses, which shows 2 threads
 // with the same `'static` reference to non-`Sync` struct. The problem is that
diff --git a/tests/ui/consts/offset.rs b/tests/ui/consts/offset.rs
index b2c663fe617..2b1db349285 100644
--- a/tests/ui/consts/offset.rs
+++ b/tests/ui/consts/offset.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 use std::ptr;
 
 #[repr(C)]
diff --git a/tests/ui/consts/offset_from.rs b/tests/ui/consts/offset_from.rs
index 465147041d9..7737b5ab0b8 100644
--- a/tests/ui/consts/offset_from.rs
+++ b/tests/ui/consts/offset_from.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_ptr_sub_ptr)]
 #![feature(ptr_sub_ptr)]
diff --git a/tests/ui/consts/offset_ub.rs b/tests/ui/consts/offset_ub.rs
index db28a6c6a2b..920ecb687cf 100644
--- a/tests/ui/consts/offset_ub.rs
+++ b/tests/ui/consts/offset_ub.rs
@@ -1,7 +1,7 @@
 use std::ptr;
 
 
-// normalize-stderr-test "0x7f+" -> "0x7f..f"
+//@ normalize-stderr-test "0x7f+" -> "0x7f..f"
 
 
 pub const BEFORE_START: *const u8 = unsafe { (&0u8 as *const u8).offset(-1) }; //~NOTE
diff --git a/tests/ui/consts/packed_pattern.rs b/tests/ui/consts/packed_pattern.rs
index 370fec6fbd4..11feca59bb5 100644
--- a/tests/ui/consts/packed_pattern.rs
+++ b/tests/ui/consts/packed_pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #[derive(PartialEq, Eq, Copy, Clone)]
 #[repr(packed)]
diff --git a/tests/ui/consts/packed_pattern2.rs b/tests/ui/consts/packed_pattern2.rs
index ef68d9e513a..09f47a0c439 100644
--- a/tests/ui/consts/packed_pattern2.rs
+++ b/tests/ui/consts/packed_pattern2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #[derive(PartialEq, Eq, Copy, Clone)]
 #[repr(packed)]
diff --git a/tests/ui/consts/precise-drop-with-coverage.rs b/tests/ui/consts/precise-drop-with-coverage.rs
index 275cb38693f..01618dbb779 100644
--- a/tests/ui/consts/precise-drop-with-coverage.rs
+++ b/tests/ui/consts/precise-drop-with-coverage.rs
@@ -1,8 +1,8 @@
 // Checks that code coverage doesn't interfere with const_precise_live_drops.
 // Regression test for issue #93848.
 //
-// check-pass
-// compile-flags: --crate-type=lib -Cinstrument-coverage  -Zno-profiler-runtime
+//@ check-pass
+//@ compile-flags: --crate-type=lib -Cinstrument-coverage  -Zno-profiler-runtime
 
 #![feature(const_precise_live_drops)]
 
diff --git a/tests/ui/consts/precise-drop-with-promoted.rs b/tests/ui/consts/precise-drop-with-promoted.rs
index 7cbe3c4e415..633df2b2067 100644
--- a/tests/ui/consts/precise-drop-with-promoted.rs
+++ b/tests/ui/consts/precise-drop-with-promoted.rs
@@ -1,6 +1,6 @@
 // Regression test for issue #89938.
-// check-pass
-// compile-flags: --crate-type=lib
+//@ check-pass
+//@ compile-flags: --crate-type=lib
 
 #![feature(const_precise_live_drops)]
 
diff --git a/tests/ui/consts/promote_borrowed_field.rs b/tests/ui/consts/promote_borrowed_field.rs
index c4841b46f60..1d3b4857b4c 100644
--- a/tests/ui/consts/promote_borrowed_field.rs
+++ b/tests/ui/consts/promote_borrowed_field.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // From https://github.com/rust-lang/rust/issues/65727
 
diff --git a/tests/ui/consts/promote_evaluation_unused_result.rs b/tests/ui/consts/promote_evaluation_unused_result.rs
index 4eda785bb89..947965ad50c 100644
--- a/tests/ui/consts/promote_evaluation_unused_result.rs
+++ b/tests/ui/consts/promote_evaluation_unused_result.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 fn main() {
 
diff --git a/tests/ui/consts/promote_fn_calls.rs b/tests/ui/consts/promote_fn_calls.rs
index 8995aaacd85..52a421ead70 100644
--- a/tests/ui/consts/promote_fn_calls.rs
+++ b/tests/ui/consts/promote_fn_calls.rs
@@ -1,5 +1,5 @@
-// build-pass (FIXME(62277): could be check-pass?)
-// aux-build:promotable_const_fn_lib.rs
+//@ build-pass (FIXME(62277): could be check-pass?)
+//@ aux-build:promotable_const_fn_lib.rs
 
 extern crate promotable_const_fn_lib;
 
diff --git a/tests/ui/consts/promote_fn_calls_std.rs b/tests/ui/consts/promote_fn_calls_std.rs
index 557f6a434f4..ec8e9143af1 100644
--- a/tests/ui/consts/promote_fn_calls_std.rs
+++ b/tests/ui/consts/promote_fn_calls_std.rs
@@ -1,5 +1,5 @@
 #![allow(deprecated, deprecated_in_future)] // can be removed if different fns are chosen
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 fn main() {
     let x: &'static u8 = &u8::max_value();
diff --git a/tests/ui/consts/promoted-storage.rs b/tests/ui/consts/promoted-storage.rs
index 52ef685e8f4..6f2cd6cc3d6 100644
--- a/tests/ui/consts/promoted-storage.rs
+++ b/tests/ui/consts/promoted-storage.rs
@@ -1,5 +1,5 @@
 // Check that storage statements reset local qualification.
-// check-pass
+//@ check-pass
 use std::cell::Cell;
 
 const C: Option<Cell<u32>> = {
diff --git a/tests/ui/consts/promoted-validation-55454.rs b/tests/ui/consts/promoted-validation-55454.rs
index 23cae4fb57d..67bbf3fce61 100644
--- a/tests/ui/consts/promoted-validation-55454.rs
+++ b/tests/ui/consts/promoted-validation-55454.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/issues/55454
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 #[derive(PartialEq)]
 struct This<T>(T);
diff --git a/tests/ui/consts/promoted_const_call.rs b/tests/ui/consts/promoted_const_call.rs
index d6e48266fd3..deaa053c415 100644
--- a/tests/ui/consts/promoted_const_call.rs
+++ b/tests/ui/consts/promoted_const_call.rs
@@ -1,4 +1,4 @@
-// known-bug: #103507
+//@ known-bug: #103507
 
 #![feature(const_mut_refs)]
 #![feature(const_trait_impl)]
diff --git a/tests/ui/consts/promoted_const_call4.rs b/tests/ui/consts/promoted_const_call4.rs
index bb97957179f..7a65ad86a9a 100644
--- a/tests/ui/consts/promoted_const_call4.rs
+++ b/tests/ui/consts/promoted_const_call4.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::sync::atomic::*;
 
diff --git a/tests/ui/consts/promoted_regression.rs b/tests/ui/consts/promoted_regression.rs
index d57036ae58f..26ce7321eb6 100644
--- a/tests/ui/consts/promoted_regression.rs
+++ b/tests/ui/consts/promoted_regression.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 fn main() {
     let _ = &[("", ""); 3];
diff --git a/tests/ui/consts/promotion-mutable-ref.rs b/tests/ui/consts/promotion-mutable-ref.rs
index d103c5a9d23..0bca8a8dca4 100644
--- a/tests/ui/consts/promotion-mutable-ref.rs
+++ b/tests/ui/consts/promotion-mutable-ref.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(const_mut_refs)]
 
 static mut TEST: i32 = {
diff --git a/tests/ui/consts/promotion.rs b/tests/ui/consts/promotion.rs
index e379e3aea13..783ca47d2c6 100644
--- a/tests/ui/consts/promotion.rs
+++ b/tests/ui/consts/promotion.rs
@@ -1,9 +1,9 @@
-// revisions: noopt opt opt_with_overflow_checks
-//[noopt]compile-flags: -C opt-level=0
-//[opt]compile-flags: -O
-//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+//@ revisions: noopt opt opt_with_overflow_checks
+//@[noopt]compile-flags: -C opt-level=0
+//@[opt]compile-flags: -O
+//@[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
 
-// build-pass
+//@ build-pass
 
 const fn assert_static<T>(_: &'static T) {}
 
diff --git a/tests/ui/consts/ptr_comparisons.rs b/tests/ui/consts/ptr_comparisons.rs
index a5b6cd9d2d4..e142ab3a754 100644
--- a/tests/ui/consts/ptr_comparisons.rs
+++ b/tests/ui/consts/ptr_comparisons.rs
@@ -1,5 +1,5 @@
-// compile-flags: --crate-type=lib
-// check-pass
+//@ compile-flags: --crate-type=lib
+//@ check-pass
 
 #![feature(
     core_intrinsics,
diff --git a/tests/ui/consts/ptr_is_null.rs b/tests/ui/consts/ptr_is_null.rs
index 43b9767db16..bbf13802312 100644
--- a/tests/ui/consts/ptr_is_null.rs
+++ b/tests/ui/consts/ptr_is_null.rs
@@ -1,5 +1,5 @@
-// compile-flags: --crate-type=lib
-// check-pass
+//@ compile-flags: --crate-type=lib
+//@ check-pass
 
 #![feature(const_ptr_is_null)]
 #![allow(useless_ptr_null_checks)]
diff --git a/tests/ui/consts/qualif-indirect-mutation-fail.rs b/tests/ui/consts/qualif-indirect-mutation-fail.rs
index a6d2934044a..420e32128a4 100644
--- a/tests/ui/consts/qualif-indirect-mutation-fail.rs
+++ b/tests/ui/consts/qualif-indirect-mutation-fail.rs
@@ -1,4 +1,4 @@
-// compile-flags: --crate-type=lib
+//@ compile-flags: --crate-type=lib
 #![feature(const_mut_refs)]
 #![feature(const_precise_live_drops)]
 #![feature(const_swap)]
diff --git a/tests/ui/consts/qualif-indirect-mutation-pass.rs b/tests/ui/consts/qualif-indirect-mutation-pass.rs
index 06af6a03b8f..9d5f0d4306d 100644
--- a/tests/ui/consts/qualif-indirect-mutation-pass.rs
+++ b/tests/ui/consts/qualif-indirect-mutation-pass.rs
@@ -1,5 +1,5 @@
-// compile-flags: --crate-type=lib
-// check-pass
+//@ compile-flags: --crate-type=lib
+//@ check-pass
 #![feature(const_mut_refs)]
 #![feature(const_precise_live_drops)]
 
diff --git a/tests/ui/consts/raw-ptr-const.rs b/tests/ui/consts/raw-ptr-const.rs
index 24a77db9ffc..2946c9b4a8e 100644
--- a/tests/ui/consts/raw-ptr-const.rs
+++ b/tests/ui/consts/raw-ptr-const.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 // This is a regression test for a `span_delayed_bug` during interning when a constant
 // evaluates to a (non-dangling) raw pointer.
diff --git a/tests/ui/consts/raw_pointer_promoted.rs b/tests/ui/consts/raw_pointer_promoted.rs
index 4c62ad444a5..9bffd79709f 100644
--- a/tests/ui/consts/raw_pointer_promoted.rs
+++ b/tests/ui/consts/raw_pointer_promoted.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub const FOO: &'static *const i32 = &(&0 as _);
 
diff --git a/tests/ui/consts/recursive-zst-static.rs b/tests/ui/consts/recursive-zst-static.rs
index 9311490020d..53d32254a68 100644
--- a/tests/ui/consts/recursive-zst-static.rs
+++ b/tests/ui/consts/recursive-zst-static.rs
@@ -1,5 +1,5 @@
-// revisions: default unleash
-//[unleash]compile-flags: -Zunleash-the-miri-inside-of-you
+//@ revisions: default unleash
+//@[unleash]compile-flags: -Zunleash-the-miri-inside-of-you
 
 // This test ensures that we do not allow ZST statics to initialize themselves without ever
 // actually creating a value of that type. This is important, as the ZST may have private fields
diff --git a/tests/ui/consts/references.rs b/tests/ui/consts/references.rs
index d0af47a8ea8..469e4f385ba 100644
--- a/tests/ui/consts/references.rs
+++ b/tests/ui/consts/references.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const FOO: &[u8] = b"foo";
 const BAR: &[u8] = &[1, 2, 3];
diff --git a/tests/ui/consts/refs_check_const_value_eq-issue-88876.rs b/tests/ui/consts/refs_check_const_value_eq-issue-88876.rs
index 6ce9da43668..446fdc75514 100644
--- a/tests/ui/consts/refs_check_const_value_eq-issue-88876.rs
+++ b/tests/ui/consts/refs_check_const_value_eq-issue-88876.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![allow(incomplete_features)]
 #![feature(adt_const_params)]
diff --git a/tests/ui/consts/repeat_match.rs b/tests/ui/consts/repeat_match.rs
index 20983184a47..e297ce01a88 100644
--- a/tests/ui/consts/repeat_match.rs
+++ b/tests/ui/consts/repeat_match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/45044
 
diff --git a/tests/ui/consts/return-in-const-fn.rs b/tests/ui/consts/return-in-const-fn.rs
index 077a33c081b..16e6ca7df8a 100644
--- a/tests/ui/consts/return-in-const-fn.rs
+++ b/tests/ui/consts/return-in-const-fn.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/43754
 
diff --git a/tests/ui/consts/rustc-impl-const-stability.rs b/tests/ui/consts/rustc-impl-const-stability.rs
index 2b67c2f2cff..98c5c897138 100644
--- a/tests/ui/consts/rustc-impl-const-stability.rs
+++ b/tests/ui/consts/rustc-impl-const-stability.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 
 #![crate_type = "lib"]
 #![feature(staged_api)]
diff --git a/tests/ui/consts/rvalue-static-promotion.rs b/tests/ui/consts/rvalue-static-promotion.rs
index f42e8b70593..e9fd30aa1ed 100644
--- a/tests/ui/consts/rvalue-static-promotion.rs
+++ b/tests/ui/consts/rvalue-static-promotion.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::cell::Cell;
 
diff --git a/tests/ui/consts/self_normalization.rs b/tests/ui/consts/self_normalization.rs
index b2a34f5877b..245f22a4955 100644
--- a/tests/ui/consts/self_normalization.rs
+++ b/tests/ui/consts/self_normalization.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 fn testfn(_arr: &mut [(); 0]) {}
 
diff --git a/tests/ui/consts/self_normalization2.rs b/tests/ui/consts/self_normalization2.rs
index 4fca38cba30..a457c45f857 100644
--- a/tests/ui/consts/self_normalization2.rs
+++ b/tests/ui/consts/self_normalization2.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 trait Gen<T> {
     fn gen(x: Self) -> T;
diff --git a/tests/ui/consts/signed_enum_discr.rs b/tests/ui/consts/signed_enum_discr.rs
index 2e4395ccf22..420322486c6 100644
--- a/tests/ui/consts/signed_enum_discr.rs
+++ b/tests/ui/consts/signed_enum_discr.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/49181
 
diff --git a/tests/ui/consts/static-cycle-error.rs b/tests/ui/consts/static-cycle-error.rs
index 9ce050aae21..b23872ed509 100644
--- a/tests/ui/consts/static-cycle-error.rs
+++ b/tests/ui/consts/static-cycle-error.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 struct Foo {
     foo: Option<&'static Foo>
diff --git a/tests/ui/consts/static-mut-refs.rs b/tests/ui/consts/static-mut-refs.rs
index ff865da5aa8..d4ebfbbf17a 100644
--- a/tests/ui/consts/static-mut-refs.rs
+++ b/tests/ui/consts/static-mut-refs.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 // Checks that mutable static items can have mutable slices and other references
diff --git a/tests/ui/consts/static-promoted-to-mutable-static.rs b/tests/ui/consts/static-promoted-to-mutable-static.rs
index d49ba478dbc..1cf72781e45 100644
--- a/tests/ui/consts/static-promoted-to-mutable-static.rs
+++ b/tests/ui/consts/static-promoted-to-mutable-static.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![allow(non_camel_case_types, non_upper_case_globals, static_mut_ref)]
 
 pub struct wl_interface {
diff --git a/tests/ui/consts/static-raw-pointer-interning.rs b/tests/ui/consts/static-raw-pointer-interning.rs
index cab60c91e16..0e915760675 100644
--- a/tests/ui/consts/static-raw-pointer-interning.rs
+++ b/tests/ui/consts/static-raw-pointer-interning.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 static FOO: Foo = Foo {
     field: &42 as *const i32,
diff --git a/tests/ui/consts/static-raw-pointer-interning2.rs b/tests/ui/consts/static-raw-pointer-interning2.rs
index 2b915fd7cb3..b279bb2261a 100644
--- a/tests/ui/consts/static-raw-pointer-interning2.rs
+++ b/tests/ui/consts/static-raw-pointer-interning2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 static mut FOO: Foo = Foo {
     field: &mut [42] as *mut [i32] as *mut i32,
diff --git a/tests/ui/consts/static_mut_containing_mut_ref.rs b/tests/ui/consts/static_mut_containing_mut_ref.rs
index 495804649b1..710328d6aa7 100644
--- a/tests/ui/consts/static_mut_containing_mut_ref.rs
+++ b/tests/ui/consts/static_mut_containing_mut_ref.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 #![allow(static_mut_ref)]
 
 static mut STDERR_BUFFER_SPACE: [u8; 42] = [0u8; 42];
diff --git a/tests/ui/consts/static_mut_containing_mut_ref2.rs b/tests/ui/consts/static_mut_containing_mut_ref2.rs
index e60a17922fd..b5110623606 100644
--- a/tests/ui/consts/static_mut_containing_mut_ref2.rs
+++ b/tests/ui/consts/static_mut_containing_mut_ref2.rs
@@ -1,4 +1,4 @@
-// revisions: stock mut_refs
+//@ revisions: stock mut_refs
 #![allow(static_mut_ref)]
 #![cfg_attr(mut_refs, feature(const_mut_refs))]
 
diff --git a/tests/ui/consts/std/iter.rs b/tests/ui/consts/std/iter.rs
index e9af781eb2b..cf121df0f6c 100644
--- a/tests/ui/consts/std/iter.rs
+++ b/tests/ui/consts/std/iter.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 const I: std::iter::Empty<u32> = std::iter::empty();
 
diff --git a/tests/ui/consts/std/slice.rs b/tests/ui/consts/std/slice.rs
index f19defc64dd..bdf1aac5df5 100644
--- a/tests/ui/consts/std/slice.rs
+++ b/tests/ui/consts/std/slice.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 struct Wrap<T>(T);
 unsafe impl<T> Send for Wrap<T> {}
diff --git a/tests/ui/consts/timeout.rs b/tests/ui/consts/timeout.rs
index c9094999ee2..c4fb8bab663 100644
--- a/tests/ui/consts/timeout.rs
+++ b/tests/ui/consts/timeout.rs
@@ -2,8 +2,8 @@
 //! the const eval timeout lint and then subsequently
 //! ICE.
 
-// compile-flags: --crate-type=lib -Ztiny-const-eval-limit
-// error-pattern: constant evaluation is taking a long time
+//@ compile-flags: --crate-type=lib -Ztiny-const-eval-limit
+//@ error-pattern: constant evaluation is taking a long time
 
 static ROOK_ATTACKS_TABLE: () = {
     0_u64.count_ones();
diff --git a/tests/ui/consts/trait_specialization.rs b/tests/ui/consts/trait_specialization.rs
index c581ef6b0f7..f195e067b55 100644
--- a/tests/ui/consts/trait_specialization.rs
+++ b/tests/ui/consts/trait_specialization.rs
@@ -1,6 +1,6 @@
-// ignore-wasm32-bare which doesn't support `std::process:exit()`
-// compile-flags: -Zmir-opt-level=3
-// run-pass
+//@ ignore-wasm32-bare which doesn't support `std::process:exit()`
+//@ compile-flags: -Zmir-opt-level=3
+//@ run-pass
 
 // Tests that specialization does not cause optimizations running on polymorphic MIR to resolve
 // to a `default` implementation.
diff --git a/tests/ui/consts/transmute-const.rs b/tests/ui/consts/transmute-const.rs
index 5044d99ec51..f03bdca29cb 100644
--- a/tests/ui/consts/transmute-const.rs
+++ b/tests/ui/consts/transmute-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::mem;
 
diff --git a/tests/ui/consts/transmute-size-mismatch-before-typeck.rs b/tests/ui/consts/transmute-size-mismatch-before-typeck.rs
index 936931acbe2..2ddce483564 100644
--- a/tests/ui/consts/transmute-size-mismatch-before-typeck.rs
+++ b/tests/ui/consts/transmute-size-mismatch-before-typeck.rs
@@ -1,7 +1,7 @@
-// normalize-stderr-64bit "64 bits" -> "word size"
-// normalize-stderr-32bit "32 bits" -> "word size"
-// normalize-stderr-64bit "128 bits" -> "2 * word size"
-// normalize-stderr-32bit "64 bits" -> "2 * word size"
+//@ normalize-stderr-64bit "64 bits" -> "word size"
+//@ normalize-stderr-32bit "32 bits" -> "word size"
+//@ normalize-stderr-64bit "128 bits" -> "2 * word size"
+//@ normalize-stderr-32bit "64 bits" -> "2 * word size"
 
 fn main() {
     match &b""[..] {
diff --git a/tests/ui/consts/try-operator.rs b/tests/ui/consts/try-operator.rs
index ed69f492fb9..352dbeefa8a 100644
--- a/tests/ui/consts/try-operator.rs
+++ b/tests/ui/consts/try-operator.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 
 #![feature(try_trait_v2)]
 #![feature(const_trait_impl)]
diff --git a/tests/ui/consts/tuple-struct-constructors.rs b/tests/ui/consts/tuple-struct-constructors.rs
index 1655f0eb850..8472a09844b 100644
--- a/tests/ui/consts/tuple-struct-constructors.rs
+++ b/tests/ui/consts/tuple-struct-constructors.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // https://github.com/rust-lang/rust/issues/41898
 
diff --git a/tests/ui/consts/underscore_const_names.rs b/tests/ui/consts/underscore_const_names.rs
index e2ae5a9d53a..2c996d25e5c 100644
--- a/tests/ui/consts/underscore_const_names.rs
+++ b/tests/ui/consts/underscore_const_names.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 #![deny(unused)]
 
diff --git a/tests/ui/consts/uninhabited-const-issue-61744.rs b/tests/ui/consts/uninhabited-const-issue-61744.rs
index ca6449cce30..6168268bfed 100644
--- a/tests/ui/consts/uninhabited-const-issue-61744.rs
+++ b/tests/ui/consts/uninhabited-const-issue-61744.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 
 pub const unsafe fn fake_type<T>() -> T {
     hint_unreachable() //~ ERROR evaluation of `<i32 as Const>::CONSTANT` failed
diff --git a/tests/ui/consts/union_constant.rs b/tests/ui/consts/union_constant.rs
index 508ff7e0ae8..f6ef235dcdd 100644
--- a/tests/ui/consts/union_constant.rs
+++ b/tests/ui/consts/union_constant.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+//@ build-pass (FIXME(62277): could be check-pass?)
 
 union Uninit {
     _never_use: *const u8,
diff --git a/tests/ui/consts/unnormalized-param-env.rs b/tests/ui/consts/unnormalized-param-env.rs
index a7bbe4db992..440d92d09f3 100644
--- a/tests/ui/consts/unnormalized-param-env.rs
+++ b/tests/ui/consts/unnormalized-param-env.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 pub trait CSpace<const N: usize> {
     type Traj;
diff --git a/tests/ui/consts/unstable-const-fn-in-libcore.rs b/tests/ui/consts/unstable-const-fn-in-libcore.rs
index b62a74039f6..baeece40a52 100644
--- a/tests/ui/consts/unstable-const-fn-in-libcore.rs
+++ b/tests/ui/consts/unstable-const-fn-in-libcore.rs
@@ -1,4 +1,4 @@
-// known-bug: #110395
+//@ known-bug: #110395
 // FIXME check-pass
 // This is a non-regression test for const-qualification of unstable items in libcore
 // as explained in issue #67053.
diff --git a/tests/ui/consts/unstable-precise-live-drops-in-libcore.rs b/tests/ui/consts/unstable-precise-live-drops-in-libcore.rs
index 619084eaa51..fb7cd905375 100644
--- a/tests/ui/consts/unstable-precise-live-drops-in-libcore.rs
+++ b/tests/ui/consts/unstable-precise-live-drops-in-libcore.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![stable(feature = "core", since = "1.6.0")]
 #![feature(staged_api)]
diff --git a/tests/ui/consts/unwind-abort.rs b/tests/ui/consts/unwind-abort.rs
index 6c94fc7b98b..35db9152bd5 100644
--- a/tests/ui/consts/unwind-abort.rs
+++ b/tests/ui/consts/unwind-abort.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(c_unwind, const_extern_fn)]
 
diff --git a/tests/ui/consts/validate_never_arrays.rs b/tests/ui/consts/validate_never_arrays.rs
index 71c1340e5f8..aa5dbdf8233 100644
--- a/tests/ui/consts/validate_never_arrays.rs
+++ b/tests/ui/consts/validate_never_arrays.rs
@@ -1,6 +1,6 @@
 // Strip out raw byte dumps to make comparison platform-independent:
-// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
+//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
 #![feature(never_type)]
 
 const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) }; //~ ERROR undefined behavior
diff --git a/tests/ui/consts/write_to_mut_ref_dest.rs b/tests/ui/consts/write_to_mut_ref_dest.rs
index 484ec424435..42ac2284038 100644
--- a/tests/ui/consts/write_to_mut_ref_dest.rs
+++ b/tests/ui/consts/write_to_mut_ref_dest.rs
@@ -1,5 +1,5 @@
-// revisions: stock mut_refs
-//[mut_refs] check-pass
+//@ revisions: stock mut_refs
+//@[mut_refs] check-pass
 
 #![cfg_attr(mut_refs, feature(const_mut_refs))]
 
diff --git a/tests/ui/consts/zst_no_llvm_alloc.rs b/tests/ui/consts/zst_no_llvm_alloc.rs
index 2a41f708c2b..1622a199a7a 100644
--- a/tests/ui/consts/zst_no_llvm_alloc.rs
+++ b/tests/ui/consts/zst_no_llvm_alloc.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #[repr(align(4))]
 struct Foo;
author	许杰友 Jieyou Xu (Joe) <jieyouxu@outlook.com>	2024-02-16 20:02:50 +0000
committer	许杰友 Jieyou Xu (Joe) <jieyouxu@outlook.com>	2024-02-16 20:02:50 +0000
commit	ec2cc761bc7067712ecc7734502f703fe3b024c8 (patch)
tree	7ab55cd9562da45b86c959f1b98c199b2b03ca92 /tests/ui/consts
parent	e53d6dd35bb38b81dff4b00497f4c152e9009499 (diff)
download	rust-ec2cc761bc7067712ecc7734502f703fe3b024c8.tar.gz rust-ec2cc761bc7067712ecc7734502f703fe3b024c8.zip