Skip to content

Commit 6e907fa

Browse files
committed
organize pass-dep tests more by the crate they test
1 parent 382475d commit 6e907fa

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

src/tools/miri/test_dependencies/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ edition = "2021"
1212
libc = "0.2"
1313
num_cpus = "1.10.1"
1414

15-
getrandom_1 = { package = "getrandom", version = "0.1" }
16-
getrandom = { version = "0.2", features = ["js"] }
15+
getrandom_01 = { package = "getrandom", version = "0.1" }
16+
getrandom_02 = { package = "getrandom", version = "0.2", features = ["js"] }
1717
rand = { version = "0.8", features = ["small_rng"] }
1818

1919
[target.'cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))'.dependencies]
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// mac-os `getrandom_01` does some pointer shenanigans
2+
//@compile-flags: -Zmiri-permissive-provenance
3+
4+
/// Test direct calls of getrandom 0.1 and 0.2
5+
fn main() {
6+
let mut data = vec![0; 16];
7+
getrandom_01::getrandom(&mut data).unwrap();
8+
getrandom_02::getrandom(&mut data).unwrap();
9+
}

src/tools/miri/tests/pass-dep/getrandom_1.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/tools/miri/tests/pass-dep/random.rs renamed to src/tools/miri/tests/pass-dep/rand.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
//@compile-flags: -Zmiri-strict-provenance
2-
use rand::{rngs::SmallRng, Rng, SeedableRng};
2+
use rand::prelude::*;
33

4+
// Test using the `rand` crate to generate randomness.
45
fn main() {
5-
// Test `getrandom` directly.
6-
let mut data = vec![0; 16];
7-
getrandom::getrandom(&mut data).unwrap();
6+
// Fully deterministic seeding.
7+
let mut rng = SmallRng::seed_from_u64(42);
8+
let _val = rng.gen::<i32>();
9+
let _val = rng.gen::<isize>();
10+
let _val = rng.gen::<i128>();
811

912
// Try seeding with "real" entropy.
1013
let mut rng = SmallRng::from_entropy();

0 commit comments

Comments
 (0)