From fa4589bcebfd995ec421f2ddd2351bc374a8273c Mon Sep 17 00:00:00 2001
From: Tomasz Miąsko <tomasz.miasko@gmail.com>
Date: Thu, 23 Jan 2025 00:00:00 +0000
Subject: Locate asan-odr-win with other sanitizer tests

---
 tests/ui/asan-odr-win/asan_odr_windows.rs         | 18 ------------------
 tests/ui/asan-odr-win/auxiliary/asan_odr_win-2.rs | 11 -----------
 tests/ui/sanitizer/asan_odr_windows.rs            | 18 ++++++++++++++++++
 tests/ui/sanitizer/auxiliary/asan_odr_win-2.rs    | 11 +++++++++++
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 tests/ui/asan-odr-win/asan_odr_windows.rs
 delete mode 100644 tests/ui/asan-odr-win/auxiliary/asan_odr_win-2.rs
 create mode 100644 tests/ui/sanitizer/asan_odr_windows.rs
 create mode 100644 tests/ui/sanitizer/auxiliary/asan_odr_win-2.rs

diff --git a/tests/ui/asan-odr-win/asan_odr_windows.rs b/tests/ui/asan-odr-win/asan_odr_windows.rs
deleted file mode 100644
index c618ac02a66..00000000000
--- a/tests/ui/asan-odr-win/asan_odr_windows.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-//! Check that crates can be linked together with `-Z sanitizer=address` on msvc.
-//! See <https://github.com/rust-lang/rust/issues/124390>.
-
-//@ run-pass
-//@ compile-flags:-Zsanitizer=address
-//@ aux-build: asan_odr_win-2.rs
-//@ only-windows-msvc
-
-extern crate othercrate;
-
-fn main() {
-    let result = std::panic::catch_unwind(|| {
-        println!("hello!");
-    });
-    assert!(result.is_ok());
-
-    othercrate::exposed_func();
-}
diff --git a/tests/ui/asan-odr-win/auxiliary/asan_odr_win-2.rs b/tests/ui/asan-odr-win/auxiliary/asan_odr_win-2.rs
deleted file mode 100644
index 75488a29e5e..00000000000
--- a/tests/ui/asan-odr-win/auxiliary/asan_odr_win-2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//@ no-prefer-dynamic
-//@ compile-flags: -Z sanitizer=address
-#![crate_name = "othercrate"]
-#![crate_type = "rlib"]
-
-pub fn exposed_func() {
-    let result = std::panic::catch_unwind(|| {
-        println!("hello!");
-    });
-    assert!(result.is_ok());
-}
diff --git a/tests/ui/sanitizer/asan_odr_windows.rs b/tests/ui/sanitizer/asan_odr_windows.rs
new file mode 100644
index 00000000000..c618ac02a66
--- /dev/null
+++ b/tests/ui/sanitizer/asan_odr_windows.rs
@@ -0,0 +1,18 @@
+//! Check that crates can be linked together with `-Z sanitizer=address` on msvc.
+//! See <https://github.com/rust-lang/rust/issues/124390>.
+
+//@ run-pass
+//@ compile-flags:-Zsanitizer=address
+//@ aux-build: asan_odr_win-2.rs
+//@ only-windows-msvc
+
+extern crate othercrate;
+
+fn main() {
+    let result = std::panic::catch_unwind(|| {
+        println!("hello!");
+    });
+    assert!(result.is_ok());
+
+    othercrate::exposed_func();
+}
diff --git a/tests/ui/sanitizer/auxiliary/asan_odr_win-2.rs b/tests/ui/sanitizer/auxiliary/asan_odr_win-2.rs
new file mode 100644
index 00000000000..75488a29e5e
--- /dev/null
+++ b/tests/ui/sanitizer/auxiliary/asan_odr_win-2.rs
@@ -0,0 +1,11 @@
+//@ no-prefer-dynamic
+//@ compile-flags: -Z sanitizer=address
+#![crate_name = "othercrate"]
+#![crate_type = "rlib"]
+
+pub fn exposed_func() {
+    let result = std::panic::catch_unwind(|| {
+        println!("hello!");
+    });
+    assert!(result.is_ok());
+}
-- 
cgit 1.4.1-3-g733a5