Skip to content

Commit ca8d372

Browse files
committed
Move std_detect tests into a separate crate
1 parent d9300b2 commit ca8d372

28 files changed

Lines changed: 45 additions & 16 deletions

library/Cargo.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,13 @@ dependencies = [
358358
"rustc-std-workspace-core",
359359
]
360360

361+
[[package]]
362+
name = "std_detect_tests"
363+
version = "0.0.0"
364+
dependencies = [
365+
"std_detect",
366+
]
367+
361368
[[package]]
362369
name = "sysroot"
363370
version = "0.0.0"

library/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ members = [
77
"sysroot",
88
"coretests",
99
"alloctests",
10+
"std_detect_tests",
1011
]
1112

1213
exclude = [
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[package]
2+
name = "std_detect_tests"
3+
version = "0.0.0"
4+
license = "MIT OR Apache-2.0"
5+
description = "Tests for std_detect"
6+
edition = "2024"
7+
8+
[dependencies]
9+
std_detect = { path = "../std_detect" }

library/std_detect/src/detect/test_data/linux-artificial-aarch64.auxv renamed to library/std_detect_tests/test_data/linux-artificial-aarch64.auxv

File renamed without changes.

library/std_detect/src/detect/test_data/linux-empty-hwcap2-aarch64.auxv renamed to library/std_detect_tests/test_data/linux-empty-hwcap2-aarch64.auxv

File renamed without changes.

library/std_detect/src/detect/test_data/linux-hwcap2-aarch64.auxv renamed to library/std_detect_tests/test_data/linux-hwcap2-aarch64.auxv

File renamed without changes.

library/std_detect/src/detect/test_data/linux-no-hwcap2-aarch64.auxv renamed to library/std_detect_tests/test_data/linux-no-hwcap2-aarch64.auxv

File renamed without changes.
File renamed without changes.

library/std_detect/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv renamed to library/std_detect_tests/test_data/macos-virtualbox-linux-x86-4850HQ.auxv

File renamed without changes.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ cfg_select! {
5151
// files on disk, so we need to embed them with `include_bytes!`.
5252
#[test]
5353
fn linux_rpi3() {
54-
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-rpi3.auxv");
54+
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-rpi3.auxv");
5555
let v = auxv_from_file(file).unwrap();
5656
assert_eq!(v.hwcap, 4174038);
5757
assert_eq!(v.hwcap2, 16);
5858
}
5959

6060
#[test]
6161
fn linux_macos_vb() {
62-
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv");
62+
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/macos-virtualbox-linux-x86-4850HQ.auxv");
6363
// The file contains HWCAP but not HWCAP2. In that case, we treat HWCAP2 as zero.
6464
let v = auxv_from_file(file).unwrap();
6565
assert_eq!(v.hwcap, 126614527);
@@ -70,15 +70,15 @@ cfg_select! {
7070
#[cfg(target_endian = "little")]
7171
#[test]
7272
fn linux_artificial_aarch64() {
73-
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-artificial-aarch64.auxv");
73+
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-artificial-aarch64.auxv");
7474
let v = auxv_from_file(file).unwrap();
7575
assert_eq!(v.hwcap, 0x0123456789abcdef);
7676
assert_eq!(v.hwcap2, 0x02468ace13579bdf);
7777
}
7878
#[cfg(target_endian = "little")]
7979
#[test]
8080
fn linux_no_hwcap2_aarch64() {
81-
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-no-hwcap2-aarch64.auxv");
81+
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-no-hwcap2-aarch64.auxv");
8282
let v = auxv_from_file(file).unwrap();
8383
// An absent HWCAP2 is treated as zero, and does not prevent acceptance of HWCAP.
8484
assert_ne!(v.hwcap, 0);

0 commit comments

Comments
 (0)