Rollup merge of rust-lang#121811 - rcvalle:rust-cfi-move-ui-tests-to-…

…sanitizer-directory, r=compiler-errors Move sanitizer ui tests to sanitizer directory Moves the sanitizer ui tests to the sanitizer directory and removes the sanitizer prefix from tests file names similarly to how the sanitizer codegen tests are organized.
hermit-os · Mar 1, 2024 · d2d1823 · d2d1823
2 parents 06ca0de + 6d75f54
commit d2d1823
Show file tree

Hide file tree

Showing 43 changed files with 4 additions and 4 deletions.
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
@@ -3797,9 +3797,9 @@
 "ui/rust-2018/uniform-paths/issue-56596-2.rs",
 "ui/rust-2018/uniform-paths/issue-56596.rs",
 "ui/rust-2018/uniform-paths/issue-87932.rs",
-"ui/sanitize/issue-111184-coroutine-witness.rs",
-"ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs",
-"ui/sanitize/issue-72154-lifetime-markers.rs",
+"ui/sanitizer/issue-111184-cfi-coroutine-witness.rs",
+"ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs",
+"ui/sanitizer/issue-72154-address-lifetime-markers.rs",
 "ui/self/issue-61882-2.rs",
 "ui/self/issue-61882.rs",
 "ui/simd/intrinsic/issue-85855.rs",

diff --git a/tests/ui/sanitize/address.rs → tests/ui/sanitizer/address.rs b/tests/ui/sanitize/address.rs → tests/ui/sanitizer/address.rs
diff --git a/tests/ui/sanitize/badfree.rs → tests/ui/sanitizer/badfree.rs b/tests/ui/sanitize/badfree.rs → tests/ui/sanitizer/badfree.rs
diff --git a/tests/ui/sanitize/cfg-kasan.rs → tests/ui/sanitizer/cfg-kasan.rs b/tests/ui/sanitize/cfg-kasan.rs → tests/ui/sanitizer/cfg-kasan.rs
diff --git a/tests/ui/sanitize/cfg.rs → tests/ui/sanitizer/cfg.rs b/tests/ui/sanitize/cfg.rs → tests/ui/sanitizer/cfg.rs
diff --git a/...-cfi-canonical-jump-tables-require-cfi.rs → ...cfi-canonical-jump-tables-requires-cfi.rs b/...-cfi-canonical-jump-tables-require-cfi.rs → ...cfi-canonical-jump-tables-requires-cfi.rs
diff --git a/...-canonical-jump-tables-require-cfi.stderr → ...canonical-jump-tables-requires-cfi.stderr b/...-canonical-jump-tables-require-cfi.stderr → ...canonical-jump-tables-requires-cfi.stderr
diff --git a/...tizer-cfi-generalize-pointers-attr-cfg.rs → ...tizer/cfi-generalize-pointers-attr-cfg.rs b/...tizer-cfi-generalize-pointers-attr-cfg.rs → ...tizer/cfi-generalize-pointers-attr-cfg.rs
diff --git a/...er-cfi-generalize-pointers-require-cfi.rs → ...r/cfi-generalize-pointers-requires-cfi.rs b/...er-cfi-generalize-pointers-require-cfi.rs → ...r/cfi-generalize-pointers-requires-cfi.rs
diff --git a/...fi-generalize-pointers-require-cfi.stderr → ...i-generalize-pointers-requires-cfi.stderr b/...fi-generalize-pointers-require-cfi.stderr → ...i-generalize-pointers-requires-cfi.stderr
diff --git a/...anitizer-cfi-invalid-attr-cfi-encoding.rs → ...anitizer/cfi-invalid-attr-cfi-encoding.rs b/...anitizer-cfi-invalid-attr-cfi-encoding.rs → ...anitizer/cfi-invalid-attr-cfi-encoding.rs
diff --git a/...izer-cfi-invalid-attr-cfi-encoding.stderr → ...izer/cfi-invalid-attr-cfi-encoding.stderr b/...izer-cfi-invalid-attr-cfi-encoding.stderr → ...izer/cfi-invalid-attr-cfi-encoding.stderr
@@ -1,5 +1,5 @@
 error: malformed `cfi_encoding` attribute input
-  --> $DIR/sanitizer-cfi-invalid-attr-cfi-encoding.rs:10:1
+  --> $DIR/cfi-invalid-attr-cfi-encoding.rs:10:1
    |
 LL | #[cfi_encoding]
    | ^^^^^^^^^^^^^^^ help: must be of the form: `#[cfi_encoding = "encoding"]`

diff --git a/...atible-with-sanitizer-kcfi.aarch64.stderr → ...-is-incompatible-with-kcfi.aarch64.stderr b/...atible-with-sanitizer-kcfi.aarch64.stderr → ...-is-incompatible-with-kcfi.aarch64.stderr
diff --git a/...fi-is-incompatible-with-sanitizer-kcfi.rs → ...anitizer/cfi-is-incompatible-with-kcfi.rs b/...fi-is-incompatible-with-sanitizer-kcfi.rs → ...anitizer/cfi-is-incompatible-with-kcfi.rs
diff --git a/...patible-with-sanitizer-kcfi.x86_64.stderr → ...i-is-incompatible-with-kcfi.x86_64.stderr b/...patible-with-sanitizer-kcfi.x86_64.stderr → ...i-is-incompatible-with-kcfi.x86_64.stderr
diff --git a/...itizer-cfi-normalize-integers-attr-cfg.rs → ...itizer/cfi-normalize-integers-attr-cfg.rs b/...itizer-cfi-normalize-integers-attr-cfg.rs → ...itizer/cfi-normalize-integers-attr-cfg.rs
diff --git a/...zer-cfi-normalize-integers-require-cfi.rs → ...er/cfi-normalize-integers-requires-cfi.rs b/...zer-cfi-normalize-integers-require-cfi.rs → ...er/cfi-normalize-integers-requires-cfi.rs
diff --git a/...cfi-normalize-integers-require-cfi.stderr → ...fi-normalize-integers-requires-cfi.stderr b/...cfi-normalize-integers-require-cfi.stderr → ...fi-normalize-integers-requires-cfi.stderr
diff --git a/...ui/sanitize/sanitizer-cfi-requires-lto.rs → tests/ui/sanitizer/cfi-requires-lto.rs b/...ui/sanitize/sanitizer-cfi-requires-lto.rs → tests/ui/sanitizer/cfi-requires-lto.rs
diff --git a/...anitize/sanitizer-cfi-requires-lto.stderr → tests/ui/sanitizer/cfi-requires-lto.stderr b/...anitize/sanitizer-cfi-requires-lto.stderr → tests/ui/sanitizer/cfi-requires-lto.stderr
diff --git a/...rustc-lto-requires-single-codegen-unit.rs → ...rustc-lto-requires-single-codegen-unit.rs b/...rustc-lto-requires-single-codegen-unit.rs → ...rustc-lto-requires-single-codegen-unit.rs
diff --git a/...c-lto-requires-single-codegen-unit.stderr → ...c-lto-requires-single-codegen-unit.stderr b/...c-lto-requires-single-codegen-unit.stderr → ...c-lto-requires-single-codegen-unit.stderr
diff --git a/tests/ui/sanitize/crt-static.rs → tests/ui/sanitizer/crt-static.rs b/tests/ui/sanitize/crt-static.rs → tests/ui/sanitizer/crt-static.rs
diff --git a/tests/ui/sanitize/crt-static.stderr → tests/ui/sanitizer/crt-static.stderr b/tests/ui/sanitize/crt-static.stderr → tests/ui/sanitizer/crt-static.stderr
diff --git a/tests/ui/sanitize/hwaddress.rs → tests/ui/sanitizer/hwaddress.rs b/tests/ui/sanitize/hwaddress.rs → tests/ui/sanitizer/hwaddress.rs
diff --git a/tests/ui/sanitize/incompatible.rs → tests/ui/sanitizer/incompatible.rs b/tests/ui/sanitize/incompatible.rs → tests/ui/sanitizer/incompatible.rs
diff --git a/tests/ui/sanitize/incompatible.stderr → tests/ui/sanitizer/incompatible.stderr b/tests/ui/sanitize/incompatible.stderr → tests/ui/sanitizer/incompatible.stderr
diff --git a/tests/ui/sanitize/inline-always.rs → tests/ui/sanitizer/inline-always.rs b/tests/ui/sanitize/inline-always.rs → tests/ui/sanitizer/inline-always.rs
diff --git a/tests/ui/sanitize/inline-always.stderr → tests/ui/sanitizer/inline-always.stderr b/tests/ui/sanitize/inline-always.stderr → tests/ui/sanitizer/inline-always.stderr
diff --git a/...anitize/issue-111184-coroutine-witness.rs → ...zer/issue-111184-cfi-coroutine-witness.rs b/...anitize/issue-111184-coroutine-witness.rs → ...zer/issue-111184-cfi-coroutine-witness.rs
diff --git a/...ssue-114275-cfi-const-expr-in-arry-len.rs → ...ssue-114275-cfi-const-expr-in-arry-len.rs b/...ssue-114275-cfi-const-expr-in-arry-len.rs → ...ssue-114275-cfi-const-expr-in-arry-len.rs
diff --git a/.../sanitize/issue-72154-lifetime-markers.rs → ...r/issue-72154-address-lifetime-markers.rs b/.../sanitize/issue-72154-lifetime-markers.rs → ...r/issue-72154-address-lifetime-markers.rs
diff --git a/tests/ui/sanitize/leak.rs → tests/ui/sanitizer/leak.rs b/tests/ui/sanitize/leak.rs → tests/ui/sanitizer/leak.rs
diff --git a/tests/ui/sanitize/memory-eager.rs → tests/ui/sanitizer/memory-eager.rs b/tests/ui/sanitize/memory-eager.rs → tests/ui/sanitizer/memory-eager.rs
diff --git a/tests/ui/sanitize/memory-passing.rs → tests/ui/sanitizer/memory-passing.rs b/tests/ui/sanitize/memory-passing.rs → tests/ui/sanitizer/memory-passing.rs
diff --git a/tests/ui/sanitize/memory.rs → tests/ui/sanitizer/memory.rs b/tests/ui/sanitize/memory.rs → tests/ui/sanitizer/memory.rs
diff --git a/...anitize/new-llvm-pass-manager-thin-lto.rs → ...nitizer/new-llvm-pass-manager-thin-lto.rs b/...anitize/new-llvm-pass-manager-thin-lto.rs → ...nitizer/new-llvm-pass-manager-thin-lto.rs
diff --git a/...i/sanitize/split-lto-unit-requires-lto.rs → .../sanitizer/split-lto-unit-requires-lto.rs b/...i/sanitize/split-lto-unit-requires-lto.rs → .../sanitizer/split-lto-unit-requires-lto.rs
diff --git a/...nitize/split-lto-unit-requires-lto.stderr → ...itizer/split-lto-unit-requires-lto.stderr b/...nitize/split-lto-unit-requires-lto.stderr → ...itizer/split-lto-unit-requires-lto.stderr
diff --git a/tests/ui/sanitize/thread.rs → tests/ui/sanitizer/thread.rs b/tests/ui/sanitize/thread.rs → tests/ui/sanitizer/thread.rs
diff --git a/tests/ui/sanitize/unsupported-target.rs → tests/ui/sanitizer/unsupported-target.rs b/tests/ui/sanitize/unsupported-target.rs → tests/ui/sanitizer/unsupported-target.rs
diff --git a/tests/ui/sanitize/unsupported-target.stderr → tests/ui/sanitizer/unsupported-target.stderr b/tests/ui/sanitize/unsupported-target.stderr → tests/ui/sanitizer/unsupported-target.stderr
diff --git a/tests/ui/sanitize/use-after-scope.rs → tests/ui/sanitizer/use-after-scope.rs b/tests/ui/sanitize/use-after-scope.rs → tests/ui/sanitizer/use-after-scope.rs