Move std_detect tests into a separate crate

bjorn3 · bjorn3 · commit c18ed7bde4f8 · 2026-01-11T11:17:53.000Z
diff --git a/library/Cargo.lock b/library/Cargo.lock
@@ -358,6 +358,10 @@ dependencies = [
  "rustc-std-workspace-core",
 ]
 
+[[package]]
+name = "std_detect_tests"
+version = "0.0.0"
+
 [[package]]
 name = "sysroot"
 version = "0.0.0"
diff --git a/library/Cargo.toml b/library/Cargo.toml
@@ -7,6 +7,7 @@ members = [
   "sysroot",
   "coretests",
   "alloctests",
+  "std_detect_tests",
 ]
 
 exclude = [
diff --git a/library/std_detect_tests/Cargo.toml b/library/std_detect_tests/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "std_detect_tests"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+description = "Tests for std_detect"
+edition = "2024"
diff --git a/library/std_detect_tests/test_data/linux-artificial-aarch64.auxv b/library/std_detect_tests/test_data/linux-artificial-aarch64.auxv
diff --git a/library/std_detect_tests/test_data/linux-empty-hwcap2-aarch64.auxv b/library/std_detect_tests/test_data/linux-empty-hwcap2-aarch64.auxv
diff --git a/library/std_detect_tests/test_data/linux-hwcap2-aarch64.auxv b/library/std_detect_tests/test_data/linux-hwcap2-aarch64.auxv
diff --git a/library/std_detect_tests/test_data/linux-no-hwcap2-aarch64.auxv b/library/std_detect_tests/test_data/linux-no-hwcap2-aarch64.auxv
diff --git a/library/std_detect_tests/test_data/linux-rpi3.auxv b/library/std_detect_tests/test_data/linux-rpi3.auxv
diff --git a/library/std_detect_tests/test_data/macos-virtualbox-linux-x86-4850HQ.auxv b/library/std_detect_tests/test_data/macos-virtualbox-linux-x86-4850HQ.auxv
diff --git a/library/std_detect_tests/tests/auxvec.rs b/library/std_detect_tests/tests/auxvec.rs
@@ -1,6 +1,8 @@
 #![allow(internal_features)]
 #![feature(cfg_select, stdarch_internal)]
 
+extern crate std_detect;
+
 use std_detect::detect::__test_os::{auxv, auxv_from_file};
 
 // FIXME: on mips/mips64 getauxval returns 0, and /proc/self/auxv
@@ -50,15 +52,15 @@ cfg_select! {
         // files on disk, so we need to embed them with `include_bytes!`.
         #[test]
         fn linux_rpi3() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-rpi3.auxv");
+            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-rpi3.auxv");
             let v = auxv_from_file(file).unwrap();
             assert_eq!(v.hwcap, 4174038);
             assert_eq!(v.hwcap2, 16);
         }
 
         #[test]
         fn linux_macos_vb() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv");
+            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/macos-virtualbox-linux-x86-4850HQ.auxv");
             // The file contains HWCAP but not HWCAP2. In that case, we treat HWCAP2 as zero.
             let v = auxv_from_file(file).unwrap();
             assert_eq!(v.hwcap, 126614527);
@@ -69,15 +71,15 @@ cfg_select! {
         #[cfg(target_endian = "little")]
         #[test]
         fn linux_artificial_aarch64() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-artificial-aarch64.auxv");
+            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-artificial-aarch64.auxv");
             let v = auxv_from_file(file).unwrap();
             assert_eq!(v.hwcap, 0x0123456789abcdef);
             assert_eq!(v.hwcap2, 0x02468ace13579bdf);
         }
         #[cfg(target_endian = "little")]
         #[test]
         fn linux_no_hwcap2_aarch64() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-no-hwcap2-aarch64.auxv");
+            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-no-hwcap2-aarch64.auxv");
             let v = auxv_from_file(file).unwrap();
             // An absent HWCAP2 is treated as zero, and does not prevent acceptance of HWCAP.
             assert_ne!(v.hwcap, 0);
diff --git a/library/std_detect_tests/tests/cpu-detection.rs b/library/std_detect_tests/tests/cpu-detection.rs
diff --git a/library/std_detect_tests/tests/linux_aarch64.rs b/library/std_detect_tests/tests/linux_aarch64.rs
@@ -6,7 +6,10 @@
 #![allow(internal_features)]
 #![feature(stdarch_internal)]
 
+extern crate std_detect;
+
 use std_detect::detect::__test_os::{AtHwcap, auxv_from_file};
+
 // The baseline hwcaps used in the (artificial) auxv test files.
 fn baseline_hwcaps() -> AtHwcap {
     AtHwcap {
@@ -31,10 +34,7 @@ fn baseline_hwcaps() -> AtHwcap {
 
 #[test]
 fn linux_empty_hwcap2_aarch64() {
-    let file = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/src/detect/test_data/linux-empty-hwcap2-aarch64.auxv"
-    );
+    let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-empty-hwcap2-aarch64.auxv");
     println!("file: {file}");
     let v = auxv_from_file(file).unwrap();
     println!("HWCAP : 0x{:0x}", v.hwcap);
@@ -43,8 +43,7 @@ fn linux_empty_hwcap2_aarch64() {
 }
 #[test]
 fn linux_no_hwcap2_aarch64() {
-    let file =
-        concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-no-hwcap2-aarch64.auxv");
+    let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-no-hwcap2-aarch64.auxv");
     println!("file: {file}");
     let v = auxv_from_file(file).unwrap();
     println!("HWCAP : 0x{:0x}", v.hwcap);
@@ -53,8 +52,7 @@ fn linux_no_hwcap2_aarch64() {
 }
 #[test]
 fn linux_hwcap2_aarch64() {
-    let file =
-        concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-hwcap2-aarch64.auxv");
+    let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-hwcap2-aarch64.auxv");
     println!("file: {file}");
     let v = auxv_from_file(file).unwrap();
     println!("HWCAP : 0x{:0x}", v.hwcap);
diff --git a/library/std_detect_tests/tests/macro_trailing_commas.rs b/library/std_detect_tests/tests/macro_trailing_commas.rs
diff --git a/library/std_detect_tests/tests/riscv.rs b/library/std_detect_tests/tests/riscv.rs
@@ -2,6 +2,8 @@
 #![allow(internal_features)]
 #![feature(stdarch_internal)]
 
+extern crate std_detect;
+
 use std_detect::detect::__test::{Feature, Initializer};
 use std_detect::detect::__test_os::imply_features;
 
diff --git a/library/std_detect_tests/tests/x86-specific.rs b/library/std_detect_tests/tests/x86-specific.rs
diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
@@ -33,7 +33,7 @@ pub struct Std {
 }
 
 impl Std {
-    const CRATE_OR_DEPS: &[&str] = &["sysroot", "coretests", "alloctests"];
+    const CRATE_OR_DEPS: &[&str] = &["sysroot", "coretests", "alloctests", "std_detect_tests"];
 }
 
 impl Step for Std {
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -3005,7 +3005,10 @@ impl Step for Crate {
     type Output = ();
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.crate_or_deps("sysroot").crate_or_deps("coretests").crate_or_deps("alloctests")
+        run.crate_or_deps("sysroot")
+            .crate_or_deps("coretests")
+            .crate_or_deps("alloctests")
+            .crate_or_deps("std_detect_tests")
     }
 
     fn is_default_step(_builder: &Builder<'_>) -> bool {
@@ -3125,6 +3128,9 @@ impl Step for Crate {
         if crates.iter().any(|crate_| crate_ == "alloc") {
             crates.push("alloctests".to_owned());
         }
+        if crates.iter().any(|crate_| crate_ == "std_detect") {
+            crates.push("std_detect_tests".to_owned());
+        }
 
         run_cargo_test(cargo, &[], &crates, &*crate_description(&self.crates), target, builder);
     }
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap
@@ -15,6 +15,7 @@ expression: bench
     - Set({bench::library/rustc-std-workspace-core})
     - Set({bench::library/std})
     - Set({bench::library/std_detect})
+    - Set({bench::library/std_detect_tests})
     - Set({bench::library/sysroot})
     - Set({bench::library/test})
     - Set({bench::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check.snap
@@ -129,6 +129,7 @@ expression: check
     - Set({check::library/rustc-std-workspace-core})
     - Set({check::library/std})
     - Set({check::library/std_detect})
+    - Set({check::library/std_detect_tests})
     - Set({check::library/sysroot})
     - Set({check::library/test})
     - Set({check::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiletest_include_default_paths.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiletest_include_default_paths.snap
@@ -129,6 +129,7 @@ expression: check compiletest --include-default-paths
     - Set({check::library/rustc-std-workspace-core})
     - Set({check::library/std})
     - Set({check::library/std_detect})
+    - Set({check::library/std_detect_tests})
     - Set({check::library/sysroot})
     - Set({check::library/test})
     - Set({check::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_library.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_library.snap
@@ -16,6 +16,7 @@ expression: check library
     - Set({check::library/rustc-std-workspace-core})
     - Set({check::library/std})
     - Set({check::library/std_detect})
+    - Set({check::library/std_detect_tests})
     - Set({check::library/sysroot})
     - Set({check::library/test})
     - Set({check::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_fix.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_fix.snap
@@ -129,6 +129,7 @@ expression: fix
     - Set({fix::library/rustc-std-workspace-core})
     - Set({fix::library/std})
     - Set({fix::library/std_detect})
+    - Set({fix::library/std_detect_tests})
     - Set({fix::library/sysroot})
     - Set({fix::library/test})
     - Set({fix::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_miri.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_miri.snap
@@ -15,6 +15,7 @@ expression: miri
     - Set({miri::library/rustc-std-workspace-core})
     - Set({miri::library/std})
     - Set({miri::library/std_detect})
+    - Set({miri::library/std_detect_tests})
     - Set({miri::library/sysroot})
     - Set({miri::library/test})
     - Set({miri::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap
@@ -65,6 +65,7 @@ expression: test
     - Set({test::library/rustc-std-workspace-core})
     - Set({test::library/std})
     - Set({test::library/std_detect})
+    - Set({test::library/std_detect_tests})
     - Set({test::library/sysroot})
     - Set({test::library/test})
     - Set({test::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap
@@ -15,6 +15,7 @@ expression: test library
     - Set({test::library/rustc-std-workspace-core})
     - Set({test::library/std})
     - Set({test::library/std_detect})
+    - Set({test::library/std_detect_tests})
     - Set({test::library/sysroot})
     - Set({test::library/test})
     - Set({test::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap
@@ -64,6 +64,7 @@ expression: test --skip=coverage
     - Set({test::library/rustc-std-workspace-core})
     - Set({test::library/std})
     - Set({test::library/std_detect})
+    - Set({test::library/std_detect_tests})
     - Set({test::library/sysroot})
     - Set({test::library/test})
     - Set({test::library/unwind})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap
@@ -1,6 +1,5 @@
 ---
 source: src/bootstrap/src/core/builder/cli_paths/tests.rs
-assertion_line: 68
 expression: test --skip=tests
 ---
 [Test] test::Tidy
@@ -29,6 +28,7 @@ expression: test --skip=tests
     - Set({test::library/rustc-std-workspace-core})
     - Set({test::library/std})
     - Set({test::library/std_detect})
+    - Set({test::library/std_detect_tests})
     - Set({test::library/sysroot})
     - Set({test::library/test})
     - Set({test::library/unwind})
diff --git a/src/tools/tidy/src/unit_tests.rs b/src/tools/tidy/src/unit_tests.rs
@@ -3,7 +3,7 @@
 //!
 //! `core` and `alloc` cannot be tested directly due to duplicating lang items.
 //! All tests and benchmarks must be written externally in
-//! `{coretests,alloctests}/{tests,benches}`.
+//! `*tests/{tests,benches}`.
 //!
 //! Outside of the standard library, tests and benchmarks should be outlined
 //! into separate files named `tests.rs` or `benches.rs`, or directories named
@@ -52,7 +52,7 @@ pub fn check(root_path: &Path, stdlib: bool, tidy_ctx: TidyCtx) {
 
         if is_dir {
             // FIXME remove those exceptions once no longer necessary
-            file_name == "std_detect" || file_name == "std" || file_name == "test"
+            file_name == "std" || file_name == "test"
         } else {
             // Tests which use non-public internals and, as such, need to
             // have the types in the same crate as the tests themselves. See

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ members = [`
`7`	`7`	`"sysroot",`
`8`	`8`	`"coretests",`
`9`	`9`	`"alloctests",`
	`10`	`+ "std_detect_tests",`
`10`	`11`	`]`
`11`	`12`
`12`	`13`	`exclude = [`