Skip to content

Commit bc56f5d

Browse files
committed
Move std_detect tests into a separate crate
1 parent 6435125 commit bc56f5d

28 files changed

Lines changed: 45 additions & 17 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
@@ -50,15 +50,15 @@ cfg_select! {
5050
// files on disk, so we need to embed them with `include_bytes!`.
5151
#[test]
5252
fn linux_rpi3() {
53-
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-rpi3.auxv");
53+
let file = concat!(env!("CARGO_MANIFEST_DIR"), "/test_data/linux-rpi3.auxv");
5454
let v = auxv_from_file(file).unwrap();
5555
assert_eq!(v.hwcap, 4174038);
5656
assert_eq!(v.hwcap2, 16);
5757
}
5858

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

0 commit comments

Comments
 (0)